summaryrefslogtreecommitdiff
path: root/t/t5515/fetch.br-remote-glob
diff options
context:
space:
mode:
authorSanti Béjar <sbejar@gmail.com>2007-03-05 08:09:39 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-03-05 08:27:37 (GMT)
commitac3ec0d5558ed6805e55d5b18bd8ee893fda9065 (patch)
tree5fda821d47066afcb6b2086a9d039e6cab498a12 /t/t5515/fetch.br-remote-glob
parent46d49472f4d49d13ea77179cd072fc1234985eed (diff)
downloadgit-ac3ec0d5558ed6805e55d5b18bd8ee893fda9065.zip
git-ac3ec0d5558ed6805e55d5b18bd8ee893fda9065.tar.gz
git-ac3ec0d5558ed6805e55d5b18bd8ee893fda9065.tar.bz2
t/t5515-fetch-merge-logic.sh: Added tests for the merge login in git-fetch
Signed-off-by: Santi Béjar <sbejar@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 't/t5515/fetch.br-remote-glob')
-rw-r--r--t/t5515/fetch.br-remote-glob11
1 files changed, 11 insertions, 0 deletions
diff --git a/t/t5515/fetch.br-remote-glob b/t/t5515/fetch.br-remote-glob
new file mode 100644
index 0000000..94e6ad3
--- /dev/null
+++ b/t/t5515/fetch.br-remote-glob
@@ -0,0 +1,11 @@
+# br-remote-glob
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge branch 'master' of ../
+8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge branch 'one' of ../
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b not-for-merge branch 'three' of ../
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 not-for-merge branch 'two' of ../
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge tag 'tag-master' of ../
+8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../
+22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b not-for-merge tag 'tag-three' of ../
+0e3b14047d3ee365f4f2a1b673db059c3972589c not-for-merge tag 'tag-three-file' of ../
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 not-for-merge tag 'tag-two' of ../