diff --git a/.gitignore b/.gitignore index e505f64505458284513f94884b800e770fb91643..45fb8f086ab909fea7d2099ecc95695e79ca81bf 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 0000000000000000000000000000000000000000..d970cc3dd4bd6658c7f8a31b054e2c214dc05133 --- /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 0000000000000000000000000000000000000000..c56c6082d6fb067ef0feeac32b34ee387b5c0a85 --- /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 0000000000000000000000000000000000000000..5aa0f4fcf1c265ac00438e321c388f05d2790adb --- /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 0000000000000000000000000000000000000000..1dcb6ad67d38c1d8416424a3f40804d855776000 --- /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 87855ecd43394dd268a6006855a6617182a34f22..36027736cf01e819cf9999f114d8d1553e22f881 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