]> asedeno.scripts.mit.edu Git - git.git/commitdiff
t/t5515-fetch-merge-logic.sh: Add two more tests
authorSanti B\e,Ai\e(Bjar <sbejar@gmail.com>
Wed, 7 Mar 2007 12:18:59 +0000 (13:18 +0100)
committerJunio C Hamano <junkio@cox.net>
Wed, 7 Mar 2007 18:22:44 +0000 (10:22 -0800)
They test the behaviour with just a URL in the command line.

Signed-off-by: Santi B\e,Ai\e(Bjar <sbejar@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
t/t5515-fetch-merge-logic.sh
t/t5515/fetch.br-unconfig_.._.git [new file with mode: 0644]
t/t5515/fetch.master_.._.git [new file with mode: 0644]

index 765c83fda7d91f66456fc2dc2299867059a66971..0b600bb429b69df02d971913e4b658bf7e313277 100755 (executable)
@@ -114,6 +114,7 @@ done >> tests
 # neither in the Pull: or .fetch config
 for branch in master br-unconfig ; do
     cat <<EOF
+$branch ../.git
 $branch ../.git one
 $branch ../.git one two
 $branch --tags ../.git
diff --git a/t/t5515/fetch.br-unconfig_.._.git b/t/t5515/fetch.br-unconfig_.._.git
new file mode 100644 (file)
index 0000000..284bb1f
--- /dev/null
@@ -0,0 +1,2 @@
+# br-unconfig ../.git
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b               ../
diff --git a/t/t5515/fetch.master_.._.git b/t/t5515/fetch.master_.._.git
new file mode 100644 (file)
index 0000000..66d1aad
--- /dev/null
@@ -0,0 +1,2 @@
+# master ../.git
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b               ../