From 5dcf2043c40db3a9d59452b7a66d23e7ffeb6358 Mon Sep 17 00:00:00 2001
From: Per Cederqvist <ceder@lysator.liu.se>
Date: Tue, 17 Apr 2012 20:26:23 +0200
Subject: [PATCH] Handle the output of git 1.7.5.4.
---
.gitignore | 1 +
stdout.master.1.txt | 2 ++
stdout.master.2.txt | 2 ++
stdout.mirror.1.txt | 2 ++
stdout.mirror.2.txt | 2 ++
test-git-reclone.sh | 11 +++++++++--
6 files changed, 18 insertions(+), 2 deletions(-)
create mode 100644 stdout.master.1.txt
create mode 100644 stdout.master.2.txt
create mode 100644 stdout.mirror.1.txt
create mode 100644 stdout.mirror.2.txt
diff --git a/.gitignore b/.gitignore
index e505f64..45fb8f0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
test-git/
+*~
diff --git a/stdout.master.1.txt b/stdout.master.1.txt
new file mode 100644
index 0000000..d970cc3
--- /dev/null
+++ b/stdout.master.1.txt
@@ -0,0 +1,2 @@
+Cloning into 'master-clone'...
+done.
diff --git a/stdout.master.2.txt b/stdout.master.2.txt
new file mode 100644
index 0000000..c56c608
--- /dev/null
+++ b/stdout.master.2.txt
@@ -0,0 +1,2 @@
+Cloning into master-clone...
+done.
diff --git a/stdout.mirror.1.txt b/stdout.mirror.1.txt
new file mode 100644
index 0000000..5aa0f4f
--- /dev/null
+++ b/stdout.mirror.1.txt
@@ -0,0 +1,2 @@
+Cloning into 'mirror-clone'...
+done.
diff --git a/stdout.mirror.2.txt b/stdout.mirror.2.txt
new file mode 100644
index 0000000..1dcb6ad
--- /dev/null
+++ b/stdout.mirror.2.txt
@@ -0,0 +1,2 @@
+Cloning into mirror-clone...
+done.
diff --git a/test-git-reclone.sh b/test-git-reclone.sh
index 87855ec..3602773 100755
--- a/test-git-reclone.sh
+++ b/test-git-reclone.sh
@@ -21,8 +21,15 @@ do
cat $what.err
exit 1
fi
- if [ "`cat $what.out`" != "Cloning into '$what-clone'...
-done." ]
+ found=false
+ for expected in ../stdout.$what.*.txt
+ do
+ if cmp -s $expected $what.out
+ then
+ found=true
+ fi
+ done
+ if ! $found
then
echo unexpected stdout from git clone:
cat $what.out
--
GitLab