{"thread":{"id":"7080","subject":"[PATCHv2] t/t5515-fetch-merge-logic.sh: Added tests for the merge login in git-fetch","startedAt":"2007-03-04T22:07:23Z","lastAt":"2007-03-05T08:40:27Z","messageCount":10,"participants":["Santi Béjar","Junio C Hamano","Joshua N Pritikin"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"36254","messageId":"87ps7oslwk.fsf@gmail.com","threadId":"7080","inReplyTo":null,"subject":"[PATCHv2] t/t5515-fetch-merge-logic.sh: Added tests for the merge login in git-fetch","fromName":"Santi Béjar","fromEmail":"sbejar@gmail.com","sentAt":"2007-03-04T22:07:23Z","receivedAt":"2007-03-04T22:07:23Z","isPatch":false,"sender":{"key":"santi@agolina.net","avatar":null},"body":"\nSigned-off-by: Santi Béjar \n---\n Hi *,\n\n it is a much reduced version (63 instead of 400 tests) but contains\n also tests for the fetched tags (missing anything else?).\n I think it is suitable to be included.\n\n Santi\n\n t/t5515-fetch-merge-logic.sh | 160 ++++++++++++++++++++\n t/t5515/fetch.br-branches-default | 8 +\n t/t5515/fetch.br-branches-default-merge | 8 +\n ...etch.br-branches-default-merge_branches-default | 8 +\n t/t5515/fetch.br-branches-default-octopus | 8 +\n ...ch.br-branches-default-octopus_branches-default | 8 +\n t/t5515/fetch.br-branches-default_branches-default | 8 +\n t/t5515/fetch.br-branches-one | 8 +\n t/t5515/fetch.br-branches-one-merge | 8 +\n t/t5515/fetch.br-branches-one-merge_branches-one | 8 +\n t/t5515/fetch.br-branches-one-octopus | 8 +\n t/t5515/fetch.br-branches-one-octopus_branches-one | 8 +\n t/t5515/fetch.br-branches-one_branches-one | 8 +\n t/t5515/fetch.br-config-explicit | 11 ++\n t/t5515/fetch.br-config-explicit-merge | 11 ++\n .../fetch.br-config-explicit-merge_config-explicit | 11 ++\n t/t5515/fetch.br-config-explicit-octopus | 11 ++\n ...etch.br-config-explicit-octopus_config-explicit | 11 ++\n t/t5515/fetch.br-config-explicit_config-explicit | 11 ++\n t/t5515/fetch.br-config-glob | 11 ++\n t/t5515/fetch.br-config-glob-merge | 11 ++\n t/t5515/fetch.br-config-glob-merge_config-glob | 11 ++\n t/t5515/fetch.br-config-glob-octopus | 11 ++\n t/t5515/fetch.br-config-glob-octopus_config-glob | 11 ++\n t/t5515/fetch.br-config-glob_config-glob | 11 ++\n t/t5515/fetch.br-remote-explicit | 11 ++\n t/t5515/fetch.br-remote-explicit-merge | 11 ++\n .../fetch.br-remote-explicit-merge_remote-explicit | 11 ++\n t/t5515/fetch.br-remote-explicit-octopus | 11 ++\n ...etch.br-remote-explicit-octopus_remote-explicit | 11 ++\n t/t5515/fetch.br-remote-explicit_remote-explicit | 11 ++\n t/t5515/fetch.br-remote-glob | 11 ++\n t/t5515/fetch.br-remote-glob-merge | 11 ++\n t/t5515/fetch.br-remote-glob-merge_remote-glob | 11 ++\n t/t5515/fetch.br-remote-glob-octopus | 11 ++\n t/t5515/fetch.br-remote-glob-octopus_remote-glob | 11 ++\n t/t5515/fetch.br-remote-glob_remote-glob | 11 ++\n t/t5515/fetch.br-unconfig | 11 ++\n t/t5515/fetch.br-unconfig_--tags_.._.git | 7 +\n t/t5515/fetch.br-unconfig_.._.git_one | 2 +\n ...nfig_.._.git_one_tag_tag-one_tag_tag-three-file | 8 +\n t/t5515/fetch.br-unconfig_.._.git_one_two | 3 +\n ...fig_.._.git_tag_tag-one-tree_tag_tag-three-file | 7 +\n ...h.br-unconfig_.._.git_tag_tag-one_tag_tag-three | 7 +\n t/t5515/fetch.br-unconfig_branches-default | 8 +\n t/t5515/fetch.br-unconfig_branches-one | 8 +\n t/t5515/fetch.br-unconfig_config-explicit | 11 ++\n t/t5515/fetch.br-unconfig_config-glob | 11 ++\n t/t5515/fetch.br-unconfig_remote-explicit | 11 ++\n t/t5515/fetch.br-unconfig_remote-glob | 11 ++\n t/t5515/fetch.master | 11 ++\n t/t5515/fetch.master_--tags_.._.git | 7 +\n t/t5515/fetch.master_.._.git_one | 2 +\n ...ster_.._.git_one_tag_tag-one_tag_tag-three-file | 8 +\n t/t5515/fetch.master_.._.git_one_two | 3 +\n ...ter_.._.git_tag_tag-one-tree_tag_tag-three-file | 7 +\n .../fetch.master_.._.git_tag_tag-one_tag_tag-three | 7 +\n t/t5515/fetch.master_branches-default | 8 +\n t/t5515/fetch.master_branches-one | 8 +\n t/t5515/fetch.master_config-explicit | 11 ++\n t/t5515/fetch.master_config-glob | 11 ++\n t/t5515/fetch.master_remote-explicit | 11 ++\n t/t5515/fetch.master_remote-glob | 11 ++\n 63 files changed, 730 insertions(+), 0 deletions(-)\n create mode 100755 t/t5515-fetch-merge-logic.sh\n create mode 100644 t/t5515/fetch.br-branches-default\n create mode 100644 t/t5515/fetch.br-branches-default-merge\n create mode 100644 t/t5515/fetch.br-branches-default-merge_branches-default\n create mode 100644 t/t5515/fetch.br-branches-default-octopus\n create mode 100644 t/t5515/fetch.br-branches-default-octopus_branches-default\n create mode 100644 t/t5515/fetch.br-branches-default_branches-default\n create mode 100644 t/t5515/fetch.br-branches-one\n create mode 100644 t/t5515/fetch.br-branches-one-merge\n create mode 100644 t/t5515/fetch.br-branches-one-merge_branches-one\n create mode 100644 t/t5515/fetch.br-branches-one-octopus\n create mode 100644 t/t5515/fetch.br-branches-one-octopus_branches-one\n create mode 100644 t/t5515/fetch.br-branches-one_branches-one\n create mode 100644 t/t5515/fetch.br-config-explicit\n create mode 100644 t/t5515/fetch.br-config-explicit-merge\n create mode 100644 t/t5515/fetch.br-config-explicit-merge_config-explicit\n create mode 100644 t/t5515/fetch.br-config-explicit-octopus\n create mode 100644 t/t5515/fetch.br-config-explicit-octopus_config-explicit\n create mode 100644 t/t5515/fetch.br-config-explicit_config-explicit\n create mode 100644 t/t5515/fetch.br-config-glob\n create mode 100644 t/t5515/fetch.br-config-glob-merge\n create mode 100644 t/t5515/fetch.br-config-glob-merge_config-glob\n create mode 100644 t/t5515/fetch.br-config-glob-octopus\n create mode 100644 t/t5515/fetch.br-config-glob-octopus_config-glob\n create mode 100644 t/t5515/fetch.br-config-glob_config-glob\n create mode 100644 t/t5515/fetch.br-remote-explicit\n create mode 100644 t/t5515/fetch.br-remote-explicit-merge\n create mode 100644 t/t5515/fetch.br-remote-explicit-merge_remote-explicit\n create mode 100644 t/t5515/fetch.br-remote-explicit-octopus\n create mode 100644 t/t5515/fetch.br-remote-explicit-octopus_remote-explicit\n create mode 100644 t/t5515/fetch.br-remote-explicit_remote-explicit\n create mode 100644 t/t5515/fetch.br-remote-glob\n create mode 100644 t/t5515/fetch.br-remote-glob-merge\n create mode 100644 t/t5515/fetch.br-remote-glob-merge_remote-glob\n create mode 100644 t/t5515/fetch.br-remote-glob-octopus\n create mode 100644 t/t5515/fetch.br-remote-glob-octopus_remote-glob\n create mode 100644 t/t5515/fetch.br-remote-glob_remote-glob\n create mode 100644 t/t5515/fetch.br-unconfig\n create mode 100644 t/t5515/fetch.br-unconfig_--tags_.._.git\n create mode 100644 t/t5515/fetch.br-unconfig_.._.git_one\n create mode 100644 t/t5515/fetch.br-unconfig_.._.git_one_tag_tag-one_tag_tag-three-file\n create mode 100644 t/t5515/fetch.br-unconfig_.._.git_one_two\n create mode 100644 t/t5515/fetch.br-unconfig_.._.git_tag_tag-one-tree_tag_tag-three-file\n create mode 100644 t/t5515/fetch.br-unconfig_.._.git_tag_tag-one_tag_tag-three\n create mode 100644 t/t5515/fetch.br-unconfig_branches-default\n create mode 100644 t/t5515/fetch.br-unconfig_branches-one\n create mode 100644 t/t5515/fetch.br-unconfig_config-explicit\n create mode 100644 t/t5515/fetch.br-unconfig_config-glob\n create mode 100644 t/t5515/fetch.br-unconfig_remote-explicit\n create mode 100644 t/t5515/fetch.br-unconfig_remote-glob\n create mode 100644 t/t5515/fetch.master\n create mode 100644 t/t5515/fetch.master_--tags_.._.git\n create mode 100644 t/t5515/fetch.master_.._.git_one\n create mode 100644 t/t5515/fetch.master_.._.git_one_tag_tag-one_tag_tag-three-file\n create mode 100644 t/t5515/fetch.master_.._.git_one_two\n create mode 100644 t/t5515/fetch.master_.._.git_tag_tag-one-tree_tag_tag-three-file\n create mode 100644 t/t5515/fetch.master_.._.git_tag_tag-one_tag_tag-three\n create mode 100644 t/t5515/fetch.master_branches-default\n create mode 100644 t/t5515/fetch.master_branches-one\n create mode 100644 t/t5515/fetch.master_config-explicit\n create mode 100644 t/t5515/fetch.master_config-glob\n create mode 100644 t/t5515/fetch.master_remote-explicit\n create mode 100644 t/t5515/fetch.master_remote-glob\n\ndiff --git a/t/t5515-fetch-merge-logic.sh b/t/t5515-fetch-merge-logic.sh\nnew file mode 100755\nindex 0000000..128f588\n--- /dev/null\n+++ b/t/t5515-fetch-merge-logic.sh\n@@ -0,0 +1,160 @@\n+#!/bin/sh\n+#\n+# Copyright (c) 2007 Santi Béjar, based on t4013 by Junio C Hamano\n+#\n+#\n+\n+test_description='Merge logic in fetch'\n+\n+. ./test-lib.sh\n+\n+LF='\n+'\n+\n+test_expect_success setup '\n+\tGIT_AUTHOR_DATE=\"2006-06-26 00:00:00 +0000\" &&\n+\tGIT_COMMITTER_DATE=\"2006-06-26 00:00:00 +0000\" &&\n+\texport GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&\n+\n+\techo >file original &&\n+\tgit add file &&\n+\tgit commit -a -m One &&\n+\tgit tag tag-one &&\n+\tgit tag tag-one-tree HEAD^{tree} &&\n+\tgit branch one &&\n+\n+\techo two >> file &&\n+\tgit commit -a -m Two &&\n+\tgit tag -a -m \"Tag Two\" tag-two &&\n+\tgit branch two &&\n+\n+\techo three >> file &&\n+\tgit commit -a -m Three &&\n+\tgit tag -a -m \"Tag Three\" tag-three &&\n+\tgit tag -a -m \"Tag Three file\" tag-three-file HEAD^{tree}:file &&\n+\tgit branch three &&\n+\n+\techo master >> file &&\n+\tgit commit -a -m Master\n+\tgit tag -a -m \"Tag Master\" tag-master &&\n+\n+\tgit checkout three\n+\n+\tgit clone . cloned &&\n+\tcd cloned &&\n+\n+\tgit config remote.config-explicit.url ../.git/ &&\n+\tgit config remote.config-explicit.fetch refs/heads/master:remotes/rem/master &&\n+\tgit config --add remote.config-explicit.fetch refs/heads/one:remotes/rem/one &&\n+\tgit config --add remote.config-explicit.fetch two:remotes/rem/two &&\n+\tgit config --add remote.config-explicit.fetch refs/heads/three:remotes/rem/three &&\n+\tremotes=\"config-explicit\" &&\n+\n+\tgit config remote.config-glob.url ../.git/ &&\n+\tgit config remote.config-glob.fetch refs/heads/*:refs/remotes/rem/* &&\n+\tremotes=\"$remotes config-glob\" &&\n+\n+\tmkdir -p .git/remotes &&\n+\t{\n+\t\techo \"URL: ../.git/\"\n+\t\techo \"Pull: refs/heads/master:remotes/rem/master\"\n+\t\techo \"Pull: refs/heads/one:remotes/rem/one\"\n+\t\techo \"Pull: two:remotes/rem/two\"\n+\t\techo \"Pull: refs/heads/three:remotes/rem/three\"\n+\t} >.git/remotes/remote-explicit &&\n+\tremotes=\"$remotes remote-explicit\" &&\n+\n+\t{\n+\t\techo \"URL: ../.git/\"\n+\t\techo \"Pull: refs/heads/*:refs/remotes/rem/*\"\n+\t} >.git/remotes/remote-glob &&\n+\tremotes=\"$remotes remote-glob\" &&\n+\n+\tmkdir -p .git/branches &&\n+\techo \"../.git\" > .git/branches/branches-default &&\n+\tremotes=\"$remotes branches-default\" &&\n+\n+\techo \"../.git#one\" > .git/branches/branches-one &&\n+\tremotes=\"$remotes branches-one\" &&\n+\n+\tfor remote in $remotes ; do\n+\t\tgit config branch.br-$remote.remote $remote &&\n+\t\tgit config branch.br-$remote-merge.remote $remote &&\n+\t\tgit config branch.br-$remote-merge.merge refs/heads/three &&\n+\t\tgit config branch.br-$remote-octopus.remote $remote &&\n+\t\tgit config branch.br-$remote-octopus.merge refs/heads/one &&\n+\t\tgit config --add branch.br-$remote-octopus.merge two &&\n+\t\tgit config --add branch.br-$remote-octopus.merge remotes/rem/three\n+\tdone\n+'\n+\n+# Merge logic depends on branch properties and Pull: or .fetch lines\n+for remote in $remotes ; do\n+ for branch in \"\" \"-merge\" \"-octopus\" ; do\n+cat < tests\n+\n+# Merge logic does not depend on branch properties,\n+# but does depend on Pull: or fetch lines.\n+# Use two branches completely unrelated from the arguments,\n+# the clone default and one without branch properties\n+for branch in master br-unconfig ; do\n+ echo $branch\n+ for remote in $remotes ; do\n+\techo $branch $remote\n+ done\n+done >> tests\n+\n+# Merge logic does not depend on branch properties\n+# neither in the Pull: or .fetch config\n+for branch in master br-unconfig ; do\n+ cat <> tests\n+\n+while read cmd\n+do\n+\tcase \"$cmd\" in\n+\t'' | '#'*) continue ;;\n+\tesac\n+\ttest=`echo \"$cmd\" | sed -e 's|[/ ][/ ]*|_|g'`\n+\tcnt=`expr $test_count + 1`\n+\tpfx=`printf \"%04d\" $cnt`\n+\texpect=\"../../t5515/fetch.$test\"\n+\tactual=\"$pfx-fetch.$test\"\n+\n+\ttest_expect_success \"$cmd\" '\n+\t\t{\n+\t\t\techo \"# $cmd\"\n+\t\t\tset x $cmd; shift\n+\t\t\tgit symbolic-ref HEAD refs/heads/$1 ; shift\n+\t\t\trm -f .git/FETCH_HEAD\n+\t\t\trm -f .git/refs/heads/*\n+\t\t\trm -f .git/refs/remotes/rem/*\n+\t\t\trm -f .git/refs/tags/*\n+\t\t\tgit fetch \"$@\" >/dev/null\n+\t\t\tcut -f -2 .git/FETCH_HEAD\n+\t\t} >\"$actual\" &&\n+\t\tif test -f \"$expect\"\n+\t\tthen\n+\t\t\tdiff -u \"$expect\" \"$actual\" &&\n+\t\t\trm -f \"$actual\"\n+\t\telse\n+\t\t\t# this is to help developing new tests.\n+\t\t\tcp \"$actual\" \"$expect\"\n+\t\t\tfalse\n+\t\tfi\n+\t'\n+done < tests\n+\n+test_done\ndiff --git a/t/t5515/fetch.br-branches-default b/t/t5515/fetch.br-branches-default\nnew file mode 100644\nindex 0000000..5d07051\n--- /dev/null\n+++ b/t/t5515/fetch.br-branches-default\n@@ -0,0 +1,8 @@\n+# br-branches-default\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\t\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\n+22feea448b023a2d864ef94b013735af34d238ba\tnot-for-merge\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\n+0e3b14047d3ee365f4f2a1b673db059c3972589c\tnot-for-merge\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\ndiff --git a/t/t5515/fetch.br-branches-default-merge b/t/t5515/fetch.br-branches-default-merge\nnew file mode 100644\nindex 0000000..85e2726\n--- /dev/null\n+++ b/t/t5515/fetch.br-branches-default-merge\n@@ -0,0 +1,8 @@\n+# br-branches-default-merge\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\t\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\n+22feea448b023a2d864ef94b013735af34d238ba\tnot-for-merge\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\n+0e3b14047d3ee365f4f2a1b673db059c3972589c\tnot-for-merge\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\ndiff --git a/t/t5515/fetch.br-branches-default-merge_branches-default b/t/t5515/fetch.br-branches-default-merge_branches-default\nnew file mode 100644\nindex 0000000..4663565\n--- /dev/null\n+++ b/t/t5515/fetch.br-branches-default-merge_branches-default\n@@ -0,0 +1,8 @@\n+# br-branches-default-merge branches-default\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\t\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\n+22feea448b023a2d864ef94b013735af34d238ba\tnot-for-merge\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\n+0e3b14047d3ee365f4f2a1b673db059c3972589c\tnot-for-merge\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\ndiff --git a/t/t5515/fetch.br-branches-default-octopus b/t/t5515/fetch.br-branches-default-octopus\nnew file mode 100644\nindex 0000000..004c4bc\n--- /dev/null\n+++ b/t/t5515/fetch.br-branches-default-octopus\n@@ -0,0 +1,8 @@\n+# br-branches-default-octopus\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\t\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\n+22feea448b023a2d864ef94b013735af34d238ba\tnot-for-merge\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\n+0e3b14047d3ee365f4f2a1b673db059c3972589c\tnot-for-merge\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\ndiff --git a/t/t5515/fetch.br-branches-default-octopus_branches-default b/t/t5515/fetch.br-branches-default-octopus_branches-default\nnew file mode 100644\nindex 0000000..8ac0e4c\n--- /dev/null\n+++ b/t/t5515/fetch.br-branches-default-octopus_branches-default\n@@ -0,0 +1,8 @@\n+# br-branches-default-octopus branches-default\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\t\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\n+22feea448b023a2d864ef94b013735af34d238ba\tnot-for-merge\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\n+0e3b14047d3ee365f4f2a1b673db059c3972589c\tnot-for-merge\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\ndiff --git a/t/t5515/fetch.br-branches-default_branches-default b/t/t5515/fetch.br-branches-default_branches-default\nnew file mode 100644\nindex 0000000..f293358\n--- /dev/null\n+++ b/t/t5515/fetch.br-branches-default_branches-default\n@@ -0,0 +1,8 @@\n+# br-branches-default branches-default\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\t\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\n+22feea448b023a2d864ef94b013735af34d238ba\tnot-for-merge\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\n+0e3b14047d3ee365f4f2a1b673db059c3972589c\tnot-for-merge\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\ndiff --git a/t/t5515/fetch.br-branches-one b/t/t5515/fetch.br-branches-one\nnew file mode 100644\nindex 0000000..16c0a31\n--- /dev/null\n+++ b/t/t5515/fetch.br-branches-one\n@@ -0,0 +1,8 @@\n+# br-branches-one\n+8e32a6d901327a23ef831511badce7bf3bf46689\t\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\n+22feea448b023a2d864ef94b013735af34d238ba\tnot-for-merge\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\n+0e3b14047d3ee365f4f2a1b673db059c3972589c\tnot-for-merge\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\ndiff --git a/t/t5515/fetch.br-branches-one-merge b/t/t5515/fetch.br-branches-one-merge\nnew file mode 100644\nindex 0000000..f9dbbaa\n--- /dev/null\n+++ b/t/t5515/fetch.br-branches-one-merge\n@@ -0,0 +1,8 @@\n+# br-branches-one-merge\n+8e32a6d901327a23ef831511badce7bf3bf46689\t\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\n+22feea448b023a2d864ef94b013735af34d238ba\tnot-for-merge\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\n+0e3b14047d3ee365f4f2a1b673db059c3972589c\tnot-for-merge\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\ndiff --git a/t/t5515/fetch.br-branches-one-merge_branches-one b/t/t5515/fetch.br-branches-one-merge_branches-one\nnew file mode 100644\nindex 0000000..b450dde\n--- /dev/null\n+++ b/t/t5515/fetch.br-branches-one-merge_branches-one\n@@ -0,0 +1,8 @@\n+# br-branches-one-merge branches-one\n+8e32a6d901327a23ef831511badce7bf3bf46689\t\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\n+22feea448b023a2d864ef94b013735af34d238ba\tnot-for-merge\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\n+0e3b14047d3ee365f4f2a1b673db059c3972589c\tnot-for-merge\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\ndiff --git a/t/t5515/fetch.br-branches-one-octopus b/t/t5515/fetch.br-branches-one-octopus\nnew file mode 100644\nindex 0000000..ef91ee3\n--- /dev/null\n+++ b/t/t5515/fetch.br-branches-one-octopus\n@@ -0,0 +1,8 @@\n+# br-branches-one-octopus\n+8e32a6d901327a23ef831511badce7bf3bf46689\t\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\n+22feea448b023a2d864ef94b013735af34d238ba\tnot-for-merge\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\n+0e3b14047d3ee365f4f2a1b673db059c3972589c\tnot-for-merge\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\ndiff --git a/t/t5515/fetch.br-branches-one-octopus_branches-one b/t/t5515/fetch.br-branches-one-octopus_branches-one\nnew file mode 100644\nindex 0000000..f2fdde4\n--- /dev/null\n+++ b/t/t5515/fetch.br-branches-one-octopus_branches-one\n@@ -0,0 +1,8 @@\n+# br-branches-one-octopus branches-one\n+8e32a6d901327a23ef831511badce7bf3bf46689\t\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\n+22feea448b023a2d864ef94b013735af34d238ba\tnot-for-merge\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\n+0e3b14047d3ee365f4f2a1b673db059c3972589c\tnot-for-merge\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\ndiff --git a/t/t5515/fetch.br-branches-one_branches-one b/t/t5515/fetch.br-branches-one_branches-one\nnew file mode 100644\nindex 0000000..407ec08\n--- /dev/null\n+++ b/t/t5515/fetch.br-branches-one_branches-one\n@@ -0,0 +1,8 @@\n+# br-branches-one branches-one\n+8e32a6d901327a23ef831511badce7bf3bf46689\t\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\n+22feea448b023a2d864ef94b013735af34d238ba\tnot-for-merge\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\n+0e3b14047d3ee365f4f2a1b673db059c3972589c\tnot-for-merge\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\ndiff --git a/t/t5515/fetch.br-config-explicit b/t/t5515/fetch.br-config-explicit\nnew file mode 100644\nindex 0000000..7101188\n--- /dev/null\n+++ b/t/t5515/fetch.br-config-explicit\n@@ -0,0 +1,11 @@\n+# br-config-explicit\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\t\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\n+22feea448b023a2d864ef94b013735af34d238ba\tnot-for-merge\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\n+0e3b14047d3ee365f4f2a1b673db059c3972589c\tnot-for-merge\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\ndiff --git a/t/t5515/fetch.br-config-explicit-merge b/t/t5515/fetch.br-config-explicit-merge\nnew file mode 100644\nindex 0000000..cb1e4cb\n--- /dev/null\n+++ b/t/t5515/fetch.br-config-explicit-merge\n@@ -0,0 +1,11 @@\n+# br-config-explicit-merge\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\t\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\n+22feea448b023a2d864ef94b013735af34d238ba\tnot-for-merge\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\n+0e3b14047d3ee365f4f2a1b673db059c3972589c\tnot-for-merge\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\ndiff --git a/t/t5515/fetch.br-config-explicit-merge_config-explicit b/t/t5515/fetch.br-config-explicit-merge_config-explicit\nnew file mode 100644\nindex 0000000..640f283\n--- /dev/null\n+++ b/t/t5515/fetch.br-config-explicit-merge_config-explicit\n@@ -0,0 +1,11 @@\n+# br-config-explicit-merge config-explicit\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\t\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\n+22feea448b023a2d864ef94b013735af34d238ba\tnot-for-merge\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\n+0e3b14047d3ee365f4f2a1b673db059c3972589c\tnot-for-merge\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\ndiff --git a/t/t5515/fetch.br-config-explicit-octopus b/t/t5515/fetch.br-config-explicit-octopus\nnew file mode 100644\nindex 0000000..ea9f165\n--- /dev/null\n+++ b/t/t5515/fetch.br-config-explicit-octopus\n@@ -0,0 +1,11 @@\n+# br-config-explicit-octopus\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\n+8e32a6d901327a23ef831511badce7bf3bf46689\t\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\t\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\n+22feea448b023a2d864ef94b013735af34d238ba\tnot-for-merge\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\n+0e3b14047d3ee365f4f2a1b673db059c3972589c\tnot-for-merge\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\ndiff --git a/t/t5515/fetch.br-config-explicit-octopus_config-explicit b/t/t5515/fetch.br-config-explicit-octopus_config-explicit\nnew file mode 100644\nindex 0000000..29fa5c1\n--- /dev/null\n+++ b/t/t5515/fetch.br-config-explicit-octopus_config-explicit\n@@ -0,0 +1,11 @@\n+# br-config-explicit-octopus config-explicit\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\n+8e32a6d901327a23ef831511badce7bf3bf46689\t\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\t\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\n+22feea448b023a2d864ef94b013735af34d238ba\tnot-for-merge\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\n+0e3b14047d3ee365f4f2a1b673db059c3972589c\tnot-for-merge\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\ndiff --git a/t/t5515/fetch.br-config-explicit_config-explicit b/t/t5515/fetch.br-config-explicit_config-explicit\nnew file mode 100644\nindex 0000000..ee7e0a6\n--- /dev/null\n+++ b/t/t5515/fetch.br-config-explicit_config-explicit\n@@ -0,0 +1,11 @@\n+# br-config-explicit config-explicit\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\t\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\n+22feea448b023a2d864ef94b013735af34d238ba\tnot-for-merge\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\n+0e3b14047d3ee365f4f2a1b673db059c3972589c\tnot-for-merge\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\ndiff --git a/t/t5515/fetch.br-config-glob b/t/t5515/fetch.br-config-glob\nnew file mode 100644\nindex 0000000..dcc9b65\n--- /dev/null\n+++ b/t/t5515/fetch.br-config-glob\n@@ -0,0 +1,11 @@\n+# br-config-glob\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\n+22feea448b023a2d864ef94b013735af34d238ba\tnot-for-merge\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\n+0e3b14047d3ee365f4f2a1b673db059c3972589c\tnot-for-merge\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\ndiff --git a/t/t5515/fetch.br-config-glob-merge b/t/t5515/fetch.br-config-glob-merge\nnew file mode 100644\nindex 0000000..ead4eb0\n--- /dev/null\n+++ b/t/t5515/fetch.br-config-glob-merge\n@@ -0,0 +1,11 @@\n+# br-config-glob-merge\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\t\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\n+22feea448b023a2d864ef94b013735af34d238ba\tnot-for-merge\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\n+0e3b14047d3ee365f4f2a1b673db059c3972589c\tnot-for-merge\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\ndiff --git a/t/t5515/fetch.br-config-glob-merge_config-glob b/t/t5515/fetch.br-config-glob-merge_config-glob\nnew file mode 100644\nindex 0000000..5db6e7b\n--- /dev/null\n+++ b/t/t5515/fetch.br-config-glob-merge_config-glob\n@@ -0,0 +1,11 @@\n+# br-config-glob-merge config-glob\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\t\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\n+22feea448b023a2d864ef94b013735af34d238ba\tnot-for-merge\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\n+0e3b14047d3ee365f4f2a1b673db059c3972589c\tnot-for-merge\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\ndiff --git a/t/t5515/fetch.br-config-glob-octopus b/t/t5515/fetch.br-config-glob-octopus\nnew file mode 100644\nindex 0000000..9d99052\n--- /dev/null\n+++ b/t/t5515/fetch.br-config-glob-octopus\n@@ -0,0 +1,11 @@\n+# br-config-glob-octopus\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\n+8e32a6d901327a23ef831511badce7bf3bf46689\t\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\n+22feea448b023a2d864ef94b013735af34d238ba\tnot-for-merge\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\n+0e3b14047d3ee365f4f2a1b673db059c3972589c\tnot-for-merge\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\ndiff --git a/t/t5515/fetch.br-config-glob-octopus_config-glob b/t/t5515/fetch.br-config-glob-octopus_config-glob\nnew file mode 100644\nindex 0000000..dfccb15\n--- /dev/null\n+++ b/t/t5515/fetch.br-config-glob-octopus_config-glob\n@@ -0,0 +1,11 @@\n+# br-config-glob-octopus config-glob\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\n+8e32a6d901327a23ef831511badce7bf3bf46689\t\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\n+22feea448b023a2d864ef94b013735af34d238ba\tnot-for-merge\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\n+0e3b14047d3ee365f4f2a1b673db059c3972589c\tnot-for-merge\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\ndiff --git a/t/t5515/fetch.br-config-glob_config-glob b/t/t5515/fetch.br-config-glob_config-glob\nnew file mode 100644\nindex 0000000..5c2fe01\n--- /dev/null\n+++ b/t/t5515/fetch.br-config-glob_config-glob\n@@ -0,0 +1,11 @@\n+# br-config-glob config-glob\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\n+22feea448b023a2d864ef94b013735af34d238ba\tnot-for-merge\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\n+0e3b14047d3ee365f4f2a1b673db059c3972589c\tnot-for-merge\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\ndiff --git a/t/t5515/fetch.br-remote-explicit b/t/t5515/fetch.br-remote-explicit\nnew file mode 100644\nindex 0000000..b874d69\n--- /dev/null\n+++ b/t/t5515/fetch.br-remote-explicit\n@@ -0,0 +1,11 @@\n+# br-remote-explicit\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\t\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\n+22feea448b023a2d864ef94b013735af34d238ba\tnot-for-merge\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\n+0e3b14047d3ee365f4f2a1b673db059c3972589c\tnot-for-merge\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\ndiff --git a/t/t5515/fetch.br-remote-explicit-merge b/t/t5515/fetch.br-remote-explicit-merge\nnew file mode 100644\nindex 0000000..0cd8921\n--- /dev/null\n+++ b/t/t5515/fetch.br-remote-explicit-merge\n@@ -0,0 +1,11 @@\n+# br-remote-explicit-merge\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\t\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\n+22feea448b023a2d864ef94b013735af34d238ba\tnot-for-merge\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\n+0e3b14047d3ee365f4f2a1b673db059c3972589c\tnot-for-merge\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\ndiff --git a/t/t5515/fetch.br-remote-explicit-merge_remote-explicit b/t/t5515/fetch.br-remote-explicit-merge_remote-explicit\nnew file mode 100644\nindex 0000000..4440063\n--- /dev/null\n+++ b/t/t5515/fetch.br-remote-explicit-merge_remote-explicit\n@@ -0,0 +1,11 @@\n+# br-remote-explicit-merge remote-explicit\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\t\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\n+22feea448b023a2d864ef94b013735af34d238ba\tnot-for-merge\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\n+0e3b14047d3ee365f4f2a1b673db059c3972589c\tnot-for-merge\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\ndiff --git a/t/t5515/fetch.br-remote-explicit-octopus b/t/t5515/fetch.br-remote-explicit-octopus\nnew file mode 100644\nindex 0000000..357dad5\n--- /dev/null\n+++ b/t/t5515/fetch.br-remote-explicit-octopus\n@@ -0,0 +1,11 @@\n+# br-remote-explicit-octopus\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\n+8e32a6d901327a23ef831511badce7bf3bf46689\t\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\t\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\n+22feea448b023a2d864ef94b013735af34d238ba\tnot-for-merge\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\n+0e3b14047d3ee365f4f2a1b673db059c3972589c\tnot-for-merge\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\ndiff --git a/t/t5515/fetch.br-remote-explicit-octopus_remote-explicit b/t/t5515/fetch.br-remote-explicit-octopus_remote-explicit\nnew file mode 100644\nindex 0000000..0da1471\n--- /dev/null\n+++ b/t/t5515/fetch.br-remote-explicit-octopus_remote-explicit\n@@ -0,0 +1,11 @@\n+# br-remote-explicit-octopus remote-explicit\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\n+8e32a6d901327a23ef831511badce7bf3bf46689\t\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\t\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\n+22feea448b023a2d864ef94b013735af34d238ba\tnot-for-merge\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\n+0e3b14047d3ee365f4f2a1b673db059c3972589c\tnot-for-merge\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\ndiff --git a/t/t5515/fetch.br-remote-explicit_remote-explicit b/t/t5515/fetch.br-remote-explicit_remote-explicit\nnew file mode 100644\nindex 0000000..af7b7cc\n--- /dev/null\n+++ b/t/t5515/fetch.br-remote-explicit_remote-explicit\n@@ -0,0 +1,11 @@\n+# br-remote-explicit remote-explicit\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\t\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\n+22feea448b023a2d864ef94b013735af34d238ba\tnot-for-merge\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\n+0e3b14047d3ee365f4f2a1b673db059c3972589c\tnot-for-merge\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\ndiff --git a/t/t5515/fetch.br-remote-glob b/t/t5515/fetch.br-remote-glob\nnew file mode 100644\nindex 0000000..bfff8ad\n--- /dev/null\n+++ b/t/t5515/fetch.br-remote-glob\n@@ -0,0 +1,11 @@\n+# br-remote-glob\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\n+22feea448b023a2d864ef94b013735af34d238ba\tnot-for-merge\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\n+0e3b14047d3ee365f4f2a1b673db059c3972589c\tnot-for-merge\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\ndiff --git a/t/t5515/fetch.br-remote-glob-merge b/t/t5515/fetch.br-remote-glob-merge\nnew file mode 100644\nindex 0000000..58c50ef\n--- /dev/null\n+++ b/t/t5515/fetch.br-remote-glob-merge\n@@ -0,0 +1,11 @@\n+# br-remote-glob-merge\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\t\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\n+22feea448b023a2d864ef94b013735af34d238ba\tnot-for-merge\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\n+0e3b14047d3ee365f4f2a1b673db059c3972589c\tnot-for-merge\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\ndiff --git a/t/t5515/fetch.br-remote-glob-merge_remote-glob b/t/t5515/fetch.br-remote-glob-merge_remote-glob\nnew file mode 100644\nindex 0000000..dbfbf66\n--- /dev/null\n+++ b/t/t5515/fetch.br-remote-glob-merge_remote-glob\n@@ -0,0 +1,11 @@\n+# br-remote-glob-merge remote-glob\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\t\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\n+22feea448b023a2d864ef94b013735af34d238ba\tnot-for-merge\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\n+0e3b14047d3ee365f4f2a1b673db059c3972589c\tnot-for-merge\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\ndiff --git a/t/t5515/fetch.br-remote-glob-octopus b/t/t5515/fetch.br-remote-glob-octopus\nnew file mode 100644\nindex 0000000..0b46c8e\n--- /dev/null\n+++ b/t/t5515/fetch.br-remote-glob-octopus\n@@ -0,0 +1,11 @@\n+# br-remote-glob-octopus\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\n+8e32a6d901327a23ef831511badce7bf3bf46689\t\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\n+22feea448b023a2d864ef94b013735af34d238ba\tnot-for-merge\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\n+0e3b14047d3ee365f4f2a1b673db059c3972589c\tnot-for-merge\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\ndiff --git a/t/t5515/fetch.br-remote-glob-octopus_remote-glob b/t/t5515/fetch.br-remote-glob-octopus_remote-glob\nnew file mode 100644\nindex 0000000..b9e5250\n--- /dev/null\n+++ b/t/t5515/fetch.br-remote-glob-octopus_remote-glob\n@@ -0,0 +1,11 @@\n+# br-remote-glob-octopus remote-glob\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\n+8e32a6d901327a23ef831511badce7bf3bf46689\t\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\n+22feea448b023a2d864ef94b013735af34d238ba\tnot-for-merge\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\n+0e3b14047d3ee365f4f2a1b673db059c3972589c\tnot-for-merge\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\ndiff --git a/t/t5515/fetch.br-remote-glob_remote-glob b/t/t5515/fetch.br-remote-glob_remote-glob\nnew file mode 100644\nindex 0000000..dbe5d23\n--- /dev/null\n+++ b/t/t5515/fetch.br-remote-glob_remote-glob\n@@ -0,0 +1,11 @@\n+# br-remote-glob remote-glob\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\n+22feea448b023a2d864ef94b013735af34d238ba\tnot-for-merge\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\n+0e3b14047d3ee365f4f2a1b673db059c3972589c\tnot-for-merge\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\ndiff --git a/t/t5515/fetch.br-unconfig b/t/t5515/fetch.br-unconfig\nnew file mode 100644\nindex 0000000..ac446c6\n--- /dev/null\n+++ b/t/t5515/fetch.br-unconfig\n@@ -0,0 +1,11 @@\n+# br-unconfig\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\n+22feea448b023a2d864ef94b013735af34d238ba\tnot-for-merge\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\n+0e3b14047d3ee365f4f2a1b673db059c3972589c\tnot-for-merge\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\ndiff --git a/t/t5515/fetch.br-unconfig_--tags_.._.git b/t/t5515/fetch.br-unconfig_--tags_.._.git\nnew file mode 100644\nindex 0000000..4ab7d67\n--- /dev/null\n+++ b/t/t5515/fetch.br-unconfig_--tags_.._.git\n@@ -0,0 +1,7 @@\n+# br-unconfig --tags ../.git\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\n+22feea448b023a2d864ef94b013735af34d238ba\tnot-for-merge\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\n+0e3b14047d3ee365f4f2a1b673db059c3972589c\tnot-for-merge\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\ndiff --git a/t/t5515/fetch.br-unconfig_.._.git_one b/t/t5515/fetch.br-unconfig_.._.git_one\nnew file mode 100644\nindex 0000000..13d28c6\n--- /dev/null\n+++ b/t/t5515/fetch.br-unconfig_.._.git_one\n@@ -0,0 +1,2 @@\n+# br-unconfig ../.git one\n+8e32a6d901327a23ef831511badce7bf3bf46689\t\ndiff --git a/t/t5515/fetch.br-unconfig_.._.git_one_tag_tag-one_tag_tag-three-file b/t/t5515/fetch.br-unconfig_.._.git_one_tag_tag-one_tag_tag-three-file\nnew file mode 100644\nindex 0000000..b7e045a\n--- /dev/null\n+++ b/t/t5515/fetch.br-unconfig_.._.git_one_tag_tag-one_tag_tag-three-file\n@@ -0,0 +1,8 @@\n+# br-unconfig ../.git one tag tag-one tag tag-three-file\n+8e32a6d901327a23ef831511badce7bf3bf46689\t\n+8e32a6d901327a23ef831511badce7bf3bf46689\t\n+0e3b14047d3ee365f4f2a1b673db059c3972589c\tnot-for-merge\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\n+22feea448b023a2d864ef94b013735af34d238ba\tnot-for-merge\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\ndiff --git a/t/t5515/fetch.br-unconfig_.._.git_one_two b/t/t5515/fetch.br-unconfig_.._.git_one_two\nnew file mode 100644\nindex 0000000..c67da8d\n--- /dev/null\n+++ b/t/t5515/fetch.br-unconfig_.._.git_one_two\n@@ -0,0 +1,3 @@\n+# br-unconfig ../.git one two\n+8e32a6d901327a23ef831511badce7bf3bf46689\t\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\t\ndiff --git a/t/t5515/fetch.br-unconfig_.._.git_tag_tag-one-tree_tag_tag-three-file b/t/t5515/fetch.br-unconfig_.._.git_tag_tag-one-tree_tag_tag-three-file\nnew file mode 100644\nindex 0000000..d2d979b\n--- /dev/null\n+++ b/t/t5515/fetch.br-unconfig_.._.git_tag_tag-one-tree_tag_tag-three-file\n@@ -0,0 +1,7 @@\n+# br-unconfig ../.git tag tag-one-tree tag tag-three-file\n+22feea448b023a2d864ef94b013735af34d238ba\tnot-for-merge\n+0e3b14047d3ee365f4f2a1b673db059c3972589c\tnot-for-merge\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\ndiff --git a/t/t5515/fetch.br-unconfig_.._.git_tag_tag-one_tag_tag-three b/t/t5515/fetch.br-unconfig_.._.git_tag_tag-one_tag_tag-three\nnew file mode 100644\nindex 0000000..2f2356a\n--- /dev/null\n+++ b/t/t5515/fetch.br-unconfig_.._.git_tag_tag-one_tag_tag-three\n@@ -0,0 +1,7 @@\n+# br-unconfig ../.git tag tag-one tag tag-three\n+8e32a6d901327a23ef831511badce7bf3bf46689\t\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\t\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\n+22feea448b023a2d864ef94b013735af34d238ba\tnot-for-merge\n+0e3b14047d3ee365f4f2a1b673db059c3972589c\tnot-for-merge\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\ndiff --git a/t/t5515/fetch.br-unconfig_branches-default b/t/t5515/fetch.br-unconfig_branches-default\nnew file mode 100644\nindex 0000000..d7367f1\n--- /dev/null\n+++ b/t/t5515/fetch.br-unconfig_branches-default\n@@ -0,0 +1,8 @@\n+# br-unconfig branches-default\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\t\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\n+22feea448b023a2d864ef94b013735af34d238ba\tnot-for-merge\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\n+0e3b14047d3ee365f4f2a1b673db059c3972589c\tnot-for-merge\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\ndiff --git a/t/t5515/fetch.br-unconfig_branches-one b/t/t5515/fetch.br-unconfig_branches-one\nnew file mode 100644\nindex 0000000..47fb837\n--- /dev/null\n+++ b/t/t5515/fetch.br-unconfig_branches-one\n@@ -0,0 +1,8 @@\n+# br-unconfig branches-one\n+8e32a6d901327a23ef831511badce7bf3bf46689\t\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\n+22feea448b023a2d864ef94b013735af34d238ba\tnot-for-merge\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\n+0e3b14047d3ee365f4f2a1b673db059c3972589c\tnot-for-merge\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\ndiff --git a/t/t5515/fetch.br-unconfig_config-explicit b/t/t5515/fetch.br-unconfig_config-explicit\nnew file mode 100644\nindex 0000000..9acccbf\n--- /dev/null\n+++ b/t/t5515/fetch.br-unconfig_config-explicit\n@@ -0,0 +1,11 @@\n+# br-unconfig config-explicit\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\t\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\n+22feea448b023a2d864ef94b013735af34d238ba\tnot-for-merge\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\n+0e3b14047d3ee365f4f2a1b673db059c3972589c\tnot-for-merge\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\ndiff --git a/t/t5515/fetch.br-unconfig_config-glob b/t/t5515/fetch.br-unconfig_config-glob\nnew file mode 100644\nindex 0000000..3e4c479\n--- /dev/null\n+++ b/t/t5515/fetch.br-unconfig_config-glob\n@@ -0,0 +1,11 @@\n+# br-unconfig config-glob\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\n+22feea448b023a2d864ef94b013735af34d238ba\tnot-for-merge\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\n+0e3b14047d3ee365f4f2a1b673db059c3972589c\tnot-for-merge\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\ndiff --git a/t/t5515/fetch.br-unconfig_remote-explicit b/t/t5515/fetch.br-unconfig_remote-explicit\nnew file mode 100644\nindex 0000000..ab72b04\n--- /dev/null\n+++ b/t/t5515/fetch.br-unconfig_remote-explicit\n@@ -0,0 +1,11 @@\n+# br-unconfig remote-explicit\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\t\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\n+22feea448b023a2d864ef94b013735af34d238ba\tnot-for-merge\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\n+0e3b14047d3ee365f4f2a1b673db059c3972589c\tnot-for-merge\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\ndiff --git a/t/t5515/fetch.br-unconfig_remote-glob b/t/t5515/fetch.br-unconfig_remote-glob\nnew file mode 100644\nindex 0000000..08c4c87\n--- /dev/null\n+++ b/t/t5515/fetch.br-unconfig_remote-glob\n@@ -0,0 +1,11 @@\n+# br-unconfig remote-glob\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\n+22feea448b023a2d864ef94b013735af34d238ba\tnot-for-merge\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\n+0e3b14047d3ee365f4f2a1b673db059c3972589c\tnot-for-merge\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\ndiff --git a/t/t5515/fetch.master b/t/t5515/fetch.master\nnew file mode 100644\nindex 0000000..ae2aedf\n--- /dev/null\n+++ b/t/t5515/fetch.master\n@@ -0,0 +1,11 @@\n+# master\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\n+22feea448b023a2d864ef94b013735af34d238ba\tnot-for-merge\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\n+0e3b14047d3ee365f4f2a1b673db059c3972589c\tnot-for-merge\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\ndiff --git a/t/t5515/fetch.master_--tags_.._.git b/t/t5515/fetch.master_--tags_.._.git\nnew file mode 100644\nindex 0000000..c297e65\n--- /dev/null\n+++ b/t/t5515/fetch.master_--tags_.._.git\n@@ -0,0 +1,7 @@\n+# master --tags ../.git\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\n+22feea448b023a2d864ef94b013735af34d238ba\tnot-for-merge\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\n+0e3b14047d3ee365f4f2a1b673db059c3972589c\tnot-for-merge\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\ndiff --git a/t/t5515/fetch.master_.._.git_one b/t/t5515/fetch.master_.._.git_one\nnew file mode 100644\nindex 0000000..090924e\n--- /dev/null\n+++ b/t/t5515/fetch.master_.._.git_one\n@@ -0,0 +1,2 @@\n+# master ../.git one\n+8e32a6d901327a23ef831511badce7bf3bf46689\t\ndiff --git a/t/t5515/fetch.master_.._.git_one_tag_tag-one_tag_tag-three-file b/t/t5515/fetch.master_.._.git_one_tag_tag-one_tag_tag-three-file\nnew file mode 100644\nindex 0000000..bdbde66\n--- /dev/null\n+++ b/t/t5515/fetch.master_.._.git_one_tag_tag-one_tag_tag-three-file\n@@ -0,0 +1,8 @@\n+# master ../.git one tag tag-one tag tag-three-file\n+8e32a6d901327a23ef831511badce7bf3bf46689\t\n+8e32a6d901327a23ef831511badce7bf3bf46689\t\n+0e3b14047d3ee365f4f2a1b673db059c3972589c\tnot-for-merge\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\n+22feea448b023a2d864ef94b013735af34d238ba\tnot-for-merge\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\ndiff --git a/t/t5515/fetch.master_.._.git_one_two b/t/t5515/fetch.master_.._.git_one_two\nnew file mode 100644\nindex 0000000..81b85aa\n--- /dev/null\n+++ b/t/t5515/fetch.master_.._.git_one_two\n@@ -0,0 +1,3 @@\n+# master ../.git one two\n+8e32a6d901327a23ef831511badce7bf3bf46689\t\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\t\ndiff --git a/t/t5515/fetch.master_.._.git_tag_tag-one-tree_tag_tag-three-file b/t/t5515/fetch.master_.._.git_tag_tag-one-tree_tag_tag-three-file\nnew file mode 100644\nindex 0000000..310516b\n--- /dev/null\n+++ b/t/t5515/fetch.master_.._.git_tag_tag-one-tree_tag_tag-three-file\n@@ -0,0 +1,7 @@\n+# master ../.git tag tag-one-tree tag tag-three-file\n+22feea448b023a2d864ef94b013735af34d238ba\tnot-for-merge\n+0e3b14047d3ee365f4f2a1b673db059c3972589c\tnot-for-merge\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\ndiff --git a/t/t5515/fetch.master_.._.git_tag_tag-one_tag_tag-three b/t/t5515/fetch.master_.._.git_tag_tag-one_tag_tag-three\nnew file mode 100644\nindex 0000000..60dbcff\n--- /dev/null\n+++ b/t/t5515/fetch.master_.._.git_tag_tag-one_tag_tag-three\n@@ -0,0 +1,7 @@\n+# master ../.git tag tag-one tag tag-three\n+8e32a6d901327a23ef831511badce7bf3bf46689\t\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\t\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\n+22feea448b023a2d864ef94b013735af34d238ba\tnot-for-merge\n+0e3b14047d3ee365f4f2a1b673db059c3972589c\tnot-for-merge\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\ndiff --git a/t/t5515/fetch.master_branches-default b/t/t5515/fetch.master_branches-default\nnew file mode 100644\nindex 0000000..937d90c\n--- /dev/null\n+++ b/t/t5515/fetch.master_branches-default\n@@ -0,0 +1,8 @@\n+# master branches-default\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\t\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\n+22feea448b023a2d864ef94b013735af34d238ba\tnot-for-merge\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\n+0e3b14047d3ee365f4f2a1b673db059c3972589c\tnot-for-merge\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\ndiff --git a/t/t5515/fetch.master_branches-one b/t/t5515/fetch.master_branches-one\nnew file mode 100644\nindex 0000000..30907fb\n--- /dev/null\n+++ b/t/t5515/fetch.master_branches-one\n@@ -0,0 +1,8 @@\n+# master branches-one\n+8e32a6d901327a23ef831511badce7bf3bf46689\t\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\n+22feea448b023a2d864ef94b013735af34d238ba\tnot-for-merge\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\n+0e3b14047d3ee365f4f2a1b673db059c3972589c\tnot-for-merge\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\ndiff --git a/t/t5515/fetch.master_config-explicit b/t/t5515/fetch.master_config-explicit\nnew file mode 100644\nindex 0000000..3e77f93\n--- /dev/null\n+++ b/t/t5515/fetch.master_config-explicit\n@@ -0,0 +1,11 @@\n+# master config-explicit\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\t\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\n+22feea448b023a2d864ef94b013735af34d238ba\tnot-for-merge\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\n+0e3b14047d3ee365f4f2a1b673db059c3972589c\tnot-for-merge\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\ndiff --git a/t/t5515/fetch.master_config-glob b/t/t5515/fetch.master_config-glob\nnew file mode 100644\nindex 0000000..c0bf9d0\n--- /dev/null\n+++ b/t/t5515/fetch.master_config-glob\n@@ -0,0 +1,11 @@\n+# master config-glob\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\n+22feea448b023a2d864ef94b013735af34d238ba\tnot-for-merge\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\n+0e3b14047d3ee365f4f2a1b673db059c3972589c\tnot-for-merge\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\ndiff --git a/t/t5515/fetch.master_remote-explicit b/t/t5515/fetch.master_remote-explicit\nnew file mode 100644\nindex 0000000..2f9d4d3\n--- /dev/null\n+++ b/t/t5515/fetch.master_remote-explicit\n@@ -0,0 +1,11 @@\n+# master remote-explicit\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\t\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\n+22feea448b023a2d864ef94b013735af34d238ba\tnot-for-merge\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\n+0e3b14047d3ee365f4f2a1b673db059c3972589c\tnot-for-merge\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\ndiff --git a/t/t5515/fetch.master_remote-glob b/t/t5515/fetch.master_remote-glob\nnew file mode 100644\nindex 0000000..7a52126\n--- /dev/null\n+++ b/t/t5515/fetch.master_remote-glob\n@@ -0,0 +1,11 @@\n+# master remote-glob\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\n+22feea448b023a2d864ef94b013735af34d238ba\tnot-for-merge\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\n+0e3b14047d3ee365f4f2a1b673db059c3972589c\tnot-for-merge\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\n-- \n1.5.0.2.879.gc531d4-dirty\n"},{"id":"36267","messageId":"7v8xec4mej.fsf@assigned-by-dhcp.cox.net","threadId":"7080","inReplyTo":"87ps7oslwk.fsf@gmail.com","subject":"Re: [PATCHv2] t/t5515-fetch-merge-logic.sh: Added tests for the merge login in git-fetch","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2007-03-04T23:30:28Z","receivedAt":"2007-03-04T23:30:28Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Santi Béjar writes:\n\n> Signed-off-by: Santi Béjar \n> ---\n> Hi *,\n>\n> it is a much reduced version (63 instead of 400 tests) but contains\n> also tests for the fetched tags (missing anything else?).\n> I think it is suitable to be included.\n\nThanks.\n\nOne thing I found lacking from the last round was that the test\nstripped the origin information later used by git-fmt-merge-msg\n(which made the test not very helpful when I tried to use it\nwhile working on the partial rewrite of git-fetch you see in the\n'next' branch). I haven't checked your patch this round yet,\nbut it would be nice to check for that to catch regressions.\n"},{"id":"36285","messageId":"8aa486160703042334w511c03c3if955f2e52b6d2268@mail.gmail.com","threadId":"7080","inReplyTo":"7v8xec4mej.fsf@assigned-by-dhcp.cox.net","subject":"Re: [PATCHv2] t/t5515-fetch-merge-logic.sh: Added tests for the merge login in git-fetch","fromName":"Santi Béjar","fromEmail":"sbejar@gmail.com","sentAt":"2007-03-05T07:34:38Z","receivedAt":"2007-03-05T07:34:38Z","isPatch":false,"sender":{"key":"santi@agolina.net","avatar":null},"body":"On 3/5/07, Junio C Hamano wrote:\n> Santi Béjar writes:\n>\n> > Signed-off-by: Santi Béjar \n> > ---\n> > Hi *,\n> >\n> > it is a much reduced version (63 instead of 400 tests) but contains\n> > also tests for the fetched tags (missing anything else?).\n> > I think it is suitable to be included.\n>\n> Thanks.\n>\n> One thing I found lacking from the last round was that the test\n> stripped the origin information later used by git-fmt-merge-msg\n> (which made the test not very helpful when I tried to use it\n> while working on the partial rewrite of git-fetch you see in the\n> 'next' branch). I haven't checked your patch this round yet,\n> but it would be nice to check for that to catch regressions.\n\nIt is stripped, I'll send another patch with the whole .git/FETCH_HEAD content.\n\nSanti\n"},{"id":"36290","messageId":"87abyskt6k.fsf@gmail.com","threadId":"7080","inReplyTo":"87ps7oslwk.fsf@gmail.com","subject":"Re: [PATCHv2] t/t5515-fetch-merge-logic.sh: Added tests for the merge login in git-fetch","fromName":"Santi Béjar","fromEmail":"sbejar@gmail.com","sentAt":"2007-03-05T08:09:39Z","receivedAt":"2007-03-05T08:09:39Z","isPatch":false,"sender":{"key":"santi@agolina.net","avatar":null},"body":"Hi *,\n\n this version does not remove the \"note\" feed to git-fmt-merge-msg.\n I've also added two &&.\n\nSanti\n\nP.D.: When sended this way the From: must be quoted or in UTF-8?\n\n-- >8 --\nFrom: =?utf-8?q?Santi_B=C3=A9jar?= \nDate: Sun, 4 Mar 2007 20:38:54 +0100\nSubject: [PATCH] t/t5515-fetch-merge-logic.sh: Added tests for the merge login in git-fetch\n\n\nSigned-off-by: Santi Béjar \n---\n t/t5515-fetch-merge-logic.sh | 161 ++++++++++++++++++++\n t/t5515/fetch.br-branches-default | 8 +\n t/t5515/fetch.br-branches-default-merge | 8 +\n ...etch.br-branches-default-merge_branches-default | 8 +\n t/t5515/fetch.br-branches-default-octopus | 8 +\n ...ch.br-branches-default-octopus_branches-default | 8 +\n t/t5515/fetch.br-branches-default_branches-default | 8 +\n t/t5515/fetch.br-branches-one | 8 +\n t/t5515/fetch.br-branches-one-merge | 8 +\n t/t5515/fetch.br-branches-one-merge_branches-one | 8 +\n t/t5515/fetch.br-branches-one-octopus | 8 +\n t/t5515/fetch.br-branches-one-octopus_branches-one | 8 +\n t/t5515/fetch.br-branches-one_branches-one | 8 +\n t/t5515/fetch.br-config-explicit | 11 ++\n t/t5515/fetch.br-config-explicit-merge | 11 ++\n .../fetch.br-config-explicit-merge_config-explicit | 11 ++\n t/t5515/fetch.br-config-explicit-octopus | 11 ++\n ...etch.br-config-explicit-octopus_config-explicit | 11 ++\n t/t5515/fetch.br-config-explicit_config-explicit | 11 ++\n t/t5515/fetch.br-config-glob | 11 ++\n t/t5515/fetch.br-config-glob-merge | 11 ++\n t/t5515/fetch.br-config-glob-merge_config-glob | 11 ++\n t/t5515/fetch.br-config-glob-octopus | 11 ++\n t/t5515/fetch.br-config-glob-octopus_config-glob | 11 ++\n t/t5515/fetch.br-config-glob_config-glob | 11 ++\n t/t5515/fetch.br-remote-explicit | 11 ++\n t/t5515/fetch.br-remote-explicit-merge | 11 ++\n .../fetch.br-remote-explicit-merge_remote-explicit | 11 ++\n t/t5515/fetch.br-remote-explicit-octopus | 11 ++\n ...etch.br-remote-explicit-octopus_remote-explicit | 11 ++\n t/t5515/fetch.br-remote-explicit_remote-explicit | 11 ++\n t/t5515/fetch.br-remote-glob | 11 ++\n t/t5515/fetch.br-remote-glob-merge | 11 ++\n t/t5515/fetch.br-remote-glob-merge_remote-glob | 11 ++\n t/t5515/fetch.br-remote-glob-octopus | 11 ++\n t/t5515/fetch.br-remote-glob-octopus_remote-glob | 11 ++\n t/t5515/fetch.br-remote-glob_remote-glob | 11 ++\n t/t5515/fetch.br-unconfig | 11 ++\n t/t5515/fetch.br-unconfig_--tags_.._.git | 7 +\n t/t5515/fetch.br-unconfig_.._.git_one | 2 +\n ...nfig_.._.git_one_tag_tag-one_tag_tag-three-file | 8 +\n t/t5515/fetch.br-unconfig_.._.git_one_two | 3 +\n ...fig_.._.git_tag_tag-one-tree_tag_tag-three-file | 7 +\n ...h.br-unconfig_.._.git_tag_tag-one_tag_tag-three | 7 +\n t/t5515/fetch.br-unconfig_branches-default | 8 +\n t/t5515/fetch.br-unconfig_branches-one | 8 +\n t/t5515/fetch.br-unconfig_config-explicit | 11 ++\n t/t5515/fetch.br-unconfig_config-glob | 11 ++\n t/t5515/fetch.br-unconfig_remote-explicit | 11 ++\n t/t5515/fetch.br-unconfig_remote-glob | 11 ++\n t/t5515/fetch.master | 11 ++\n t/t5515/fetch.master_--tags_.._.git | 7 +\n t/t5515/fetch.master_.._.git_one | 2 +\n ...ster_.._.git_one_tag_tag-one_tag_tag-three-file | 8 +\n t/t5515/fetch.master_.._.git_one_two | 3 +\n ...ter_.._.git_tag_tag-one-tree_tag_tag-three-file | 7 +\n .../fetch.master_.._.git_tag_tag-one_tag_tag-three | 7 +\n t/t5515/fetch.master_branches-default | 8 +\n t/t5515/fetch.master_branches-one | 8 +\n t/t5515/fetch.master_config-explicit | 11 ++\n t/t5515/fetch.master_config-glob | 11 ++\n t/t5515/fetch.master_remote-explicit | 11 ++\n t/t5515/fetch.master_remote-glob | 11 ++\n 63 files changed, 731 insertions(+), 0 deletions(-)\n create mode 100755 t/t5515-fetch-merge-logic.sh\n create mode 100644 t/t5515/fetch.br-branches-default\n create mode 100644 t/t5515/fetch.br-branches-default-merge\n create mode 100644 t/t5515/fetch.br-branches-default-merge_branches-default\n create mode 100644 t/t5515/fetch.br-branches-default-octopus\n create mode 100644 t/t5515/fetch.br-branches-default-octopus_branches-default\n create mode 100644 t/t5515/fetch.br-branches-default_branches-default\n create mode 100644 t/t5515/fetch.br-branches-one\n create mode 100644 t/t5515/fetch.br-branches-one-merge\n create mode 100644 t/t5515/fetch.br-branches-one-merge_branches-one\n create mode 100644 t/t5515/fetch.br-branches-one-octopus\n create mode 100644 t/t5515/fetch.br-branches-one-octopus_branches-one\n create mode 100644 t/t5515/fetch.br-branches-one_branches-one\n create mode 100644 t/t5515/fetch.br-config-explicit\n create mode 100644 t/t5515/fetch.br-config-explicit-merge\n create mode 100644 t/t5515/fetch.br-config-explicit-merge_config-explicit\n create mode 100644 t/t5515/fetch.br-config-explicit-octopus\n create mode 100644 t/t5515/fetch.br-config-explicit-octopus_config-explicit\n create mode 100644 t/t5515/fetch.br-config-explicit_config-explicit\n create mode 100644 t/t5515/fetch.br-config-glob\n create mode 100644 t/t5515/fetch.br-config-glob-merge\n create mode 100644 t/t5515/fetch.br-config-glob-merge_config-glob\n create mode 100644 t/t5515/fetch.br-config-glob-octopus\n create mode 100644 t/t5515/fetch.br-config-glob-octopus_config-glob\n create mode 100644 t/t5515/fetch.br-config-glob_config-glob\n create mode 100644 t/t5515/fetch.br-remote-explicit\n create mode 100644 t/t5515/fetch.br-remote-explicit-merge\n create mode 100644 t/t5515/fetch.br-remote-explicit-merge_remote-explicit\n create mode 100644 t/t5515/fetch.br-remote-explicit-octopus\n create mode 100644 t/t5515/fetch.br-remote-explicit-octopus_remote-explicit\n create mode 100644 t/t5515/fetch.br-remote-explicit_remote-explicit\n create mode 100644 t/t5515/fetch.br-remote-glob\n create mode 100644 t/t5515/fetch.br-remote-glob-merge\n create mode 100644 t/t5515/fetch.br-remote-glob-merge_remote-glob\n create mode 100644 t/t5515/fetch.br-remote-glob-octopus\n create mode 100644 t/t5515/fetch.br-remote-glob-octopus_remote-glob\n create mode 100644 t/t5515/fetch.br-remote-glob_remote-glob\n create mode 100644 t/t5515/fetch.br-unconfig\n create mode 100644 t/t5515/fetch.br-unconfig_--tags_.._.git\n create mode 100644 t/t5515/fetch.br-unconfig_.._.git_one\n create mode 100644 t/t5515/fetch.br-unconfig_.._.git_one_tag_tag-one_tag_tag-three-file\n create mode 100644 t/t5515/fetch.br-unconfig_.._.git_one_two\n create mode 100644 t/t5515/fetch.br-unconfig_.._.git_tag_tag-one-tree_tag_tag-three-file\n create mode 100644 t/t5515/fetch.br-unconfig_.._.git_tag_tag-one_tag_tag-three\n create mode 100644 t/t5515/fetch.br-unconfig_branches-default\n create mode 100644 t/t5515/fetch.br-unconfig_branches-one\n create mode 100644 t/t5515/fetch.br-unconfig_config-explicit\n create mode 100644 t/t5515/fetch.br-unconfig_config-glob\n create mode 100644 t/t5515/fetch.br-unconfig_remote-explicit\n create mode 100644 t/t5515/fetch.br-unconfig_remote-glob\n create mode 100644 t/t5515/fetch.master\n create mode 100644 t/t5515/fetch.master_--tags_.._.git\n create mode 100644 t/t5515/fetch.master_.._.git_one\n create mode 100644 t/t5515/fetch.master_.._.git_one_tag_tag-one_tag_tag-three-file\n create mode 100644 t/t5515/fetch.master_.._.git_one_two\n create mode 100644 t/t5515/fetch.master_.._.git_tag_tag-one-tree_tag_tag-three-file\n create mode 100644 t/t5515/fetch.master_.._.git_tag_tag-one_tag_tag-three\n create mode 100644 t/t5515/fetch.master_branches-default\n create mode 100644 t/t5515/fetch.master_branches-one\n create mode 100644 t/t5515/fetch.master_config-explicit\n create mode 100644 t/t5515/fetch.master_config-glob\n create mode 100644 t/t5515/fetch.master_remote-explicit\n create mode 100644 t/t5515/fetch.master_remote-glob\n\ndiff --git a/t/t5515-fetch-merge-logic.sh b/t/t5515-fetch-merge-logic.sh\nnew file mode 100755\nindex 0000000..765c83f\n--- /dev/null\n+++ b/t/t5515-fetch-merge-logic.sh\n@@ -0,0 +1,161 @@\n+#!/bin/sh\n+#\n+# Copyright (c) 2007 Santi Béjar, based on t4013 by Junio C Hamano\n+#\n+#\n+\n+test_description='Merge logic in fetch'\n+\n+. ./test-lib.sh\n+\n+LF='\n+'\n+\n+test_expect_success setup '\n+\tGIT_AUTHOR_DATE=\"2006-06-26 00:00:00 +0000\" &&\n+\tGIT_COMMITTER_DATE=\"2006-06-26 00:00:00 +0000\" &&\n+\texport GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&\n+\n+\techo >file original &&\n+\tgit add file &&\n+\tgit commit -a -m One &&\n+\tgit tag tag-one &&\n+\tgit tag tag-one-tree HEAD^{tree} &&\n+\tgit branch one &&\n+\n+\techo two >> file &&\n+\tgit commit -a -m Two &&\n+\tgit tag -a -m \"Tag Two\" tag-two &&\n+\tgit branch two &&\n+\n+\techo three >> file &&\n+\tgit commit -a -m Three &&\n+\tgit tag -a -m \"Tag Three\" tag-three &&\n+\tgit tag -a -m \"Tag Three file\" tag-three-file HEAD^{tree}:file &&\n+\tgit branch three &&\n+\n+\techo master >> file &&\n+\tgit commit -a -m Master &&\n+\tgit tag -a -m \"Tag Master\" tag-master &&\n+\n+\tgit checkout three &&\n+\n+\tgit clone . cloned &&\n+\tcd cloned &&\n+\tgit config remote.origin.url ../.git/ &&\n+\n+\tgit config remote.config-explicit.url ../.git/ &&\n+\tgit config remote.config-explicit.fetch refs/heads/master:remotes/rem/master &&\n+\tgit config --add remote.config-explicit.fetch refs/heads/one:remotes/rem/one &&\n+\tgit config --add remote.config-explicit.fetch two:remotes/rem/two &&\n+\tgit config --add remote.config-explicit.fetch refs/heads/three:remotes/rem/three &&\n+\tremotes=\"config-explicit\" &&\n+\n+\tgit config remote.config-glob.url ../.git/ &&\n+\tgit config remote.config-glob.fetch refs/heads/*:refs/remotes/rem/* &&\n+\tremotes=\"$remotes config-glob\" &&\n+\n+\tmkdir -p .git/remotes &&\n+\t{\n+\t\techo \"URL: ../.git/\"\n+\t\techo \"Pull: refs/heads/master:remotes/rem/master\"\n+\t\techo \"Pull: refs/heads/one:remotes/rem/one\"\n+\t\techo \"Pull: two:remotes/rem/two\"\n+\t\techo \"Pull: refs/heads/three:remotes/rem/three\"\n+\t} >.git/remotes/remote-explicit &&\n+\tremotes=\"$remotes remote-explicit\" &&\n+\n+\t{\n+\t\techo \"URL: ../.git/\"\n+\t\techo \"Pull: refs/heads/*:refs/remotes/rem/*\"\n+\t} >.git/remotes/remote-glob &&\n+\tremotes=\"$remotes remote-glob\" &&\n+\n+\tmkdir -p .git/branches &&\n+\techo \"../.git\" > .git/branches/branches-default &&\n+\tremotes=\"$remotes branches-default\" &&\n+\n+\techo \"../.git#one\" > .git/branches/branches-one &&\n+\tremotes=\"$remotes branches-one\" &&\n+\n+\tfor remote in $remotes ; do\n+\t\tgit config branch.br-$remote.remote $remote &&\n+\t\tgit config branch.br-$remote-merge.remote $remote &&\n+\t\tgit config branch.br-$remote-merge.merge refs/heads/three &&\n+\t\tgit config branch.br-$remote-octopus.remote $remote &&\n+\t\tgit config branch.br-$remote-octopus.merge refs/heads/one &&\n+\t\tgit config --add branch.br-$remote-octopus.merge two &&\n+\t\tgit config --add branch.br-$remote-octopus.merge remotes/rem/three\n+\tdone\n+'\n+\n+# Merge logic depends on branch properties and Pull: or .fetch lines\n+for remote in $remotes ; do\n+ for branch in \"\" \"-merge\" \"-octopus\" ; do\n+cat < tests\n+\n+# Merge logic does not depend on branch properties,\n+# but does depend on Pull: or fetch lines.\n+# Use two branches completely unrelated from the arguments,\n+# the clone default and one without branch properties\n+for branch in master br-unconfig ; do\n+ echo $branch\n+ for remote in $remotes ; do\n+\techo $branch $remote\n+ done\n+done >> tests\n+\n+# Merge logic does not depend on branch properties\n+# neither in the Pull: or .fetch config\n+for branch in master br-unconfig ; do\n+ cat <> tests\n+\n+while read cmd\n+do\n+\tcase \"$cmd\" in\n+\t'' | '#'*) continue ;;\n+\tesac\n+\ttest=`echo \"$cmd\" | sed -e 's|[/ ][/ ]*|_|g'`\n+\tcnt=`expr $test_count + 1`\n+\tpfx=`printf \"%04d\" $cnt`\n+\texpect=\"../../t5515/fetch.$test\"\n+\tactual=\"$pfx-fetch.$test\"\n+\n+\ttest_expect_success \"$cmd\" '\n+\t\t{\n+\t\t\techo \"# $cmd\"\n+\t\t\tset x $cmd; shift\n+\t\t\tgit symbolic-ref HEAD refs/heads/$1 ; shift\n+\t\t\trm -f .git/FETCH_HEAD\n+\t\t\trm -f .git/refs/heads/*\n+\t\t\trm -f .git/refs/remotes/rem/*\n+\t\t\trm -f .git/refs/tags/*\n+\t\t\tgit fetch \"$@\" >/dev/null\n+\t\t\tcat .git/FETCH_HEAD\n+\t\t} >\"$actual\" &&\n+\t\tif test -f \"$expect\"\n+\t\tthen\n+\t\t\tdiff -u \"$expect\" \"$actual\" &&\n+\t\t\trm -f \"$actual\"\n+\t\telse\n+\t\t\t# this is to help developing new tests.\n+\t\t\tcp \"$actual\" \"$expect\"\n+\t\t\tfalse\n+\t\tfi\n+\t'\n+done < tests\n+\n+test_done\ndiff --git a/t/t5515/fetch.br-branches-default b/t/t5515/fetch.br-branches-default\nnew file mode 100644\nindex 0000000..2e0414f\n--- /dev/null\n+++ b/t/t5515/fetch.br-branches-default\n@@ -0,0 +1,8 @@\n+# br-branches-default\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\t\tbranch 'master' of ../\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\ttag 'tag-master' of ../\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\ttag 'tag-one' of ../\n+22feea448b023a2d864ef94b013735af34d238ba\tnot-for-merge\ttag 'tag-one-tree' of ../\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\ttag 'tag-three' of ../\n+0e3b14047d3ee365f4f2a1b673db059c3972589c\tnot-for-merge\ttag 'tag-three-file' of ../\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\ttag 'tag-two' of ../\ndiff --git a/t/t5515/fetch.br-branches-default-merge b/t/t5515/fetch.br-branches-default-merge\nnew file mode 100644\nindex 0000000..ea65f31\n--- /dev/null\n+++ b/t/t5515/fetch.br-branches-default-merge\n@@ -0,0 +1,8 @@\n+# br-branches-default-merge\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\t\tbranch 'master' of ../\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\ttag 'tag-master' of ../\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\ttag 'tag-one' of ../\n+22feea448b023a2d864ef94b013735af34d238ba\tnot-for-merge\ttag 'tag-one-tree' of ../\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\ttag 'tag-three' of ../\n+0e3b14047d3ee365f4f2a1b673db059c3972589c\tnot-for-merge\ttag 'tag-three-file' of ../\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\ttag 'tag-two' of ../\ndiff --git a/t/t5515/fetch.br-branches-default-merge_branches-default b/t/t5515/fetch.br-branches-default-merge_branches-default\nnew file mode 100644\nindex 0000000..7b5fa94\n--- /dev/null\n+++ b/t/t5515/fetch.br-branches-default-merge_branches-default\n@@ -0,0 +1,8 @@\n+# br-branches-default-merge branches-default\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\t\tbranch 'master' of ../\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\ttag 'tag-master' of ../\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\ttag 'tag-one' of ../\n+22feea448b023a2d864ef94b013735af34d238ba\tnot-for-merge\ttag 'tag-one-tree' of ../\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\ttag 'tag-three' of ../\n+0e3b14047d3ee365f4f2a1b673db059c3972589c\tnot-for-merge\ttag 'tag-three-file' of ../\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\ttag 'tag-two' of ../\ndiff --git a/t/t5515/fetch.br-branches-default-octopus b/t/t5515/fetch.br-branches-default-octopus\nnew file mode 100644\nindex 0000000..128397d\n--- /dev/null\n+++ b/t/t5515/fetch.br-branches-default-octopus\n@@ -0,0 +1,8 @@\n+# br-branches-default-octopus\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\t\tbranch 'master' of ../\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\ttag 'tag-master' of ../\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\ttag 'tag-one' of ../\n+22feea448b023a2d864ef94b013735af34d238ba\tnot-for-merge\ttag 'tag-one-tree' of ../\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\ttag 'tag-three' of ../\n+0e3b14047d3ee365f4f2a1b673db059c3972589c\tnot-for-merge\ttag 'tag-three-file' of ../\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\ttag 'tag-two' of ../\ndiff --git a/t/t5515/fetch.br-branches-default-octopus_branches-default b/t/t5515/fetch.br-branches-default-octopus_branches-default\nnew file mode 100644\nindex 0000000..4b37cd4\n--- /dev/null\n+++ b/t/t5515/fetch.br-branches-default-octopus_branches-default\n@@ -0,0 +1,8 @@\n+# br-branches-default-octopus branches-default\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\t\tbranch 'master' of ../\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\ttag 'tag-master' of ../\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\ttag 'tag-one' of ../\n+22feea448b023a2d864ef94b013735af34d238ba\tnot-for-merge\ttag 'tag-one-tree' of ../\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\ttag 'tag-three' of ../\n+0e3b14047d3ee365f4f2a1b673db059c3972589c\tnot-for-merge\ttag 'tag-three-file' of ../\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\ttag 'tag-two' of ../\ndiff --git a/t/t5515/fetch.br-branches-default_branches-default b/t/t5515/fetch.br-branches-default_branches-default\nnew file mode 100644\nindex 0000000..4a2bf3c\n--- /dev/null\n+++ b/t/t5515/fetch.br-branches-default_branches-default\n@@ -0,0 +1,8 @@\n+# br-branches-default branches-default\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\t\tbranch 'master' of ../\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\ttag 'tag-master' of ../\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\ttag 'tag-one' of ../\n+22feea448b023a2d864ef94b013735af34d238ba\tnot-for-merge\ttag 'tag-one-tree' of ../\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\ttag 'tag-three' of ../\n+0e3b14047d3ee365f4f2a1b673db059c3972589c\tnot-for-merge\ttag 'tag-three-file' of ../\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\ttag 'tag-two' of ../\ndiff --git a/t/t5515/fetch.br-branches-one b/t/t5515/fetch.br-branches-one\nnew file mode 100644\nindex 0000000..12ac8d2\n--- /dev/null\n+++ b/t/t5515/fetch.br-branches-one\n@@ -0,0 +1,8 @@\n+# br-branches-one\n+8e32a6d901327a23ef831511badce7bf3bf46689\t\tbranch 'one' of ../\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\ttag 'tag-master' of ../\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\ttag 'tag-one' of ../\n+22feea448b023a2d864ef94b013735af34d238ba\tnot-for-merge\ttag 'tag-one-tree' of ../\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\ttag 'tag-three' of ../\n+0e3b14047d3ee365f4f2a1b673db059c3972589c\tnot-for-merge\ttag 'tag-three-file' of ../\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\ttag 'tag-two' of ../\ndiff --git a/t/t5515/fetch.br-branches-one-merge b/t/t5515/fetch.br-branches-one-merge\nnew file mode 100644\nindex 0000000..3a4e77e\n--- /dev/null\n+++ b/t/t5515/fetch.br-branches-one-merge\n@@ -0,0 +1,8 @@\n+# br-branches-one-merge\n+8e32a6d901327a23ef831511badce7bf3bf46689\t\tbranch 'one' of ../\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\ttag 'tag-master' of ../\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\ttag 'tag-one' of ../\n+22feea448b023a2d864ef94b013735af34d238ba\tnot-for-merge\ttag 'tag-one-tree' of ../\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\ttag 'tag-three' of ../\n+0e3b14047d3ee365f4f2a1b673db059c3972589c\tnot-for-merge\ttag 'tag-three-file' of ../\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\ttag 'tag-two' of ../\ndiff --git a/t/t5515/fetch.br-branches-one-merge_branches-one b/t/t5515/fetch.br-branches-one-merge_branches-one\nnew file mode 100644\nindex 0000000..00e04b4\n--- /dev/null\n+++ b/t/t5515/fetch.br-branches-one-merge_branches-one\n@@ -0,0 +1,8 @@\n+# br-branches-one-merge branches-one\n+8e32a6d901327a23ef831511badce7bf3bf46689\t\tbranch 'one' of ../\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\ttag 'tag-master' of ../\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\ttag 'tag-one' of ../\n+22feea448b023a2d864ef94b013735af34d238ba\tnot-for-merge\ttag 'tag-one-tree' of ../\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\ttag 'tag-three' of ../\n+0e3b14047d3ee365f4f2a1b673db059c3972589c\tnot-for-merge\ttag 'tag-three-file' of ../\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\ttag 'tag-two' of ../\ndiff --git a/t/t5515/fetch.br-branches-one-octopus b/t/t5515/fetch.br-branches-one-octopus\nnew file mode 100644\nindex 0000000..53fe808\n--- /dev/null\n+++ b/t/t5515/fetch.br-branches-one-octopus\n@@ -0,0 +1,8 @@\n+# br-branches-one-octopus\n+8e32a6d901327a23ef831511badce7bf3bf46689\t\tbranch 'one' of ../\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\ttag 'tag-master' of ../\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\ttag 'tag-one' of ../\n+22feea448b023a2d864ef94b013735af34d238ba\tnot-for-merge\ttag 'tag-one-tree' of ../\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\ttag 'tag-three' of ../\n+0e3b14047d3ee365f4f2a1b673db059c3972589c\tnot-for-merge\ttag 'tag-three-file' of ../\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\ttag 'tag-two' of ../\ndiff --git a/t/t5515/fetch.br-branches-one-octopus_branches-one b/t/t5515/fetch.br-branches-one-octopus_branches-one\nnew file mode 100644\nindex 0000000..41b18ff\n--- /dev/null\n+++ b/t/t5515/fetch.br-branches-one-octopus_branches-one\n@@ -0,0 +1,8 @@\n+# br-branches-one-octopus branches-one\n+8e32a6d901327a23ef831511badce7bf3bf46689\t\tbranch 'one' of ../\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\ttag 'tag-master' of ../\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\ttag 'tag-one' of ../\n+22feea448b023a2d864ef94b013735af34d238ba\tnot-for-merge\ttag 'tag-one-tree' of ../\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\ttag 'tag-three' of ../\n+0e3b14047d3ee365f4f2a1b673db059c3972589c\tnot-for-merge\ttag 'tag-three-file' of ../\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\ttag 'tag-two' of ../\ndiff --git a/t/t5515/fetch.br-branches-one_branches-one b/t/t5515/fetch.br-branches-one_branches-one\nnew file mode 100644\nindex 0000000..281fa09\n--- /dev/null\n+++ b/t/t5515/fetch.br-branches-one_branches-one\n@@ -0,0 +1,8 @@\n+# br-branches-one branches-one\n+8e32a6d901327a23ef831511badce7bf3bf46689\t\tbranch 'one' of ../\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\ttag 'tag-master' of ../\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\ttag 'tag-one' of ../\n+22feea448b023a2d864ef94b013735af34d238ba\tnot-for-merge\ttag 'tag-one-tree' of ../\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\ttag 'tag-three' of ../\n+0e3b14047d3ee365f4f2a1b673db059c3972589c\tnot-for-merge\ttag 'tag-three-file' of ../\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\ttag 'tag-two' of ../\ndiff --git a/t/t5515/fetch.br-config-explicit b/t/t5515/fetch.br-config-explicit\nnew file mode 100644\nindex 0000000..e2fa9c8\n--- /dev/null\n+++ b/t/t5515/fetch.br-config-explicit\n@@ -0,0 +1,11 @@\n+# br-config-explicit\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\t\tbranch 'master' of ../\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\tbranch 'one' of ../\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\tbranch 'two' of ../\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\tbranch 'three' of ../\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\ttag 'tag-master' of ../\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\ttag 'tag-one' of ../\n+22feea448b023a2d864ef94b013735af34d238ba\tnot-for-merge\ttag 'tag-one-tree' of ../\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\ttag 'tag-three' of ../\n+0e3b14047d3ee365f4f2a1b673db059c3972589c\tnot-for-merge\ttag 'tag-three-file' of ../\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\ttag 'tag-two' of ../\ndiff --git a/t/t5515/fetch.br-config-explicit-merge b/t/t5515/fetch.br-config-explicit-merge\nnew file mode 100644\nindex 0000000..ec1a723\n--- /dev/null\n+++ b/t/t5515/fetch.br-config-explicit-merge\n@@ -0,0 +1,11 @@\n+# br-config-explicit-merge\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\tbranch 'master' of ../\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\tbranch 'one' of ../\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\tbranch 'two' of ../\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\t\tbranch 'three' of ../\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\ttag 'tag-master' of ../\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\ttag 'tag-one' of ../\n+22feea448b023a2d864ef94b013735af34d238ba\tnot-for-merge\ttag 'tag-one-tree' of ../\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\ttag 'tag-three' of ../\n+0e3b14047d3ee365f4f2a1b673db059c3972589c\tnot-for-merge\ttag 'tag-three-file' of ../\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\ttag 'tag-two' of ../\ndiff --git a/t/t5515/fetch.br-config-explicit-merge_config-explicit b/t/t5515/fetch.br-config-explicit-merge_config-explicit\nnew file mode 100644\nindex 0000000..54f6891\n--- /dev/null\n+++ b/t/t5515/fetch.br-config-explicit-merge_config-explicit\n@@ -0,0 +1,11 @@\n+# br-config-explicit-merge config-explicit\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\tbranch 'master' of ../\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\tbranch 'one' of ../\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\tbranch 'two' of ../\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\t\tbranch 'three' of ../\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\ttag 'tag-master' of ../\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\ttag 'tag-one' of ../\n+22feea448b023a2d864ef94b013735af34d238ba\tnot-for-merge\ttag 'tag-one-tree' of ../\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\ttag 'tag-three' of ../\n+0e3b14047d3ee365f4f2a1b673db059c3972589c\tnot-for-merge\ttag 'tag-three-file' of ../\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\ttag 'tag-two' of ../\ndiff --git a/t/t5515/fetch.br-config-explicit-octopus b/t/t5515/fetch.br-config-explicit-octopus\nnew file mode 100644\nindex 0000000..7011dfc\n--- /dev/null\n+++ b/t/t5515/fetch.br-config-explicit-octopus\n@@ -0,0 +1,11 @@\n+# br-config-explicit-octopus\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\tbranch 'master' of ../\n+8e32a6d901327a23ef831511badce7bf3bf46689\t\tbranch 'one' of ../\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\t\tbranch 'two' of ../\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\tbranch 'three' of ../\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\ttag 'tag-master' of ../\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\ttag 'tag-one' of ../\n+22feea448b023a2d864ef94b013735af34d238ba\tnot-for-merge\ttag 'tag-one-tree' of ../\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\ttag 'tag-three' of ../\n+0e3b14047d3ee365f4f2a1b673db059c3972589c\tnot-for-merge\ttag 'tag-three-file' of ../\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\ttag 'tag-two' of ../\ndiff --git a/t/t5515/fetch.br-config-explicit-octopus_config-explicit b/t/t5515/fetch.br-config-explicit-octopus_config-explicit\nnew file mode 100644\nindex 0000000..bdad51f\n--- /dev/null\n+++ b/t/t5515/fetch.br-config-explicit-octopus_config-explicit\n@@ -0,0 +1,11 @@\n+# br-config-explicit-octopus config-explicit\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\tbranch 'master' of ../\n+8e32a6d901327a23ef831511badce7bf3bf46689\t\tbranch 'one' of ../\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\t\tbranch 'two' of ../\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\tbranch 'three' of ../\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\ttag 'tag-master' of ../\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\ttag 'tag-one' of ../\n+22feea448b023a2d864ef94b013735af34d238ba\tnot-for-merge\ttag 'tag-one-tree' of ../\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\ttag 'tag-three' of ../\n+0e3b14047d3ee365f4f2a1b673db059c3972589c\tnot-for-merge\ttag 'tag-three-file' of ../\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\ttag 'tag-two' of ../\ndiff --git a/t/t5515/fetch.br-config-explicit_config-explicit b/t/t5515/fetch.br-config-explicit_config-explicit\nnew file mode 100644\nindex 0000000..1b237dd\n--- /dev/null\n+++ b/t/t5515/fetch.br-config-explicit_config-explicit\n@@ -0,0 +1,11 @@\n+# br-config-explicit config-explicit\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\t\tbranch 'master' of ../\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\tbranch 'one' of ../\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\tbranch 'two' of ../\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\tbranch 'three' of ../\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\ttag 'tag-master' of ../\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\ttag 'tag-one' of ../\n+22feea448b023a2d864ef94b013735af34d238ba\tnot-for-merge\ttag 'tag-one-tree' of ../\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\ttag 'tag-three' of ../\n+0e3b14047d3ee365f4f2a1b673db059c3972589c\tnot-for-merge\ttag 'tag-three-file' of ../\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\ttag 'tag-two' of ../\ndiff --git a/t/t5515/fetch.br-config-glob b/t/t5515/fetch.br-config-glob\nnew file mode 100644\nindex 0000000..e75ec2f\n--- /dev/null\n+++ b/t/t5515/fetch.br-config-glob\n@@ -0,0 +1,11 @@\n+# br-config-glob\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\tbranch 'master' of ../\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\tbranch 'one' of ../\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\tbranch 'three' of ../\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\tbranch 'two' of ../\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\ttag 'tag-master' of ../\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\ttag 'tag-one' of ../\n+22feea448b023a2d864ef94b013735af34d238ba\tnot-for-merge\ttag 'tag-one-tree' of ../\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\ttag 'tag-three' of ../\n+0e3b14047d3ee365f4f2a1b673db059c3972589c\tnot-for-merge\ttag 'tag-three-file' of ../\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\ttag 'tag-two' of ../\ndiff --git a/t/t5515/fetch.br-config-glob-merge b/t/t5515/fetch.br-config-glob-merge\nnew file mode 100644\nindex 0000000..ce8f739\n--- /dev/null\n+++ b/t/t5515/fetch.br-config-glob-merge\n@@ -0,0 +1,11 @@\n+# br-config-glob-merge\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\tbranch 'master' of ../\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\tbranch 'one' of ../\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\t\tbranch 'three' of ../\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\tbranch 'two' of ../\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\ttag 'tag-master' of ../\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\ttag 'tag-one' of ../\n+22feea448b023a2d864ef94b013735af34d238ba\tnot-for-merge\ttag 'tag-one-tree' of ../\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\ttag 'tag-three' of ../\n+0e3b14047d3ee365f4f2a1b673db059c3972589c\tnot-for-merge\ttag 'tag-three-file' of ../\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\ttag 'tag-two' of ../\ndiff --git a/t/t5515/fetch.br-config-glob-merge_config-glob b/t/t5515/fetch.br-config-glob-merge_config-glob\nnew file mode 100644\nindex 0000000..5817bed\n--- /dev/null\n+++ b/t/t5515/fetch.br-config-glob-merge_config-glob\n@@ -0,0 +1,11 @@\n+# br-config-glob-merge config-glob\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\tbranch 'master' of ../\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\tbranch 'one' of ../\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\t\tbranch 'three' of ../\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\tbranch 'two' of ../\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\ttag 'tag-master' of ../\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\ttag 'tag-one' of ../\n+22feea448b023a2d864ef94b013735af34d238ba\tnot-for-merge\ttag 'tag-one-tree' of ../\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\ttag 'tag-three' of ../\n+0e3b14047d3ee365f4f2a1b673db059c3972589c\tnot-for-merge\ttag 'tag-three-file' of ../\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\ttag 'tag-two' of ../\ndiff --git a/t/t5515/fetch.br-config-glob-octopus b/t/t5515/fetch.br-config-glob-octopus\nnew file mode 100644\nindex 0000000..9ee213e\n--- /dev/null\n+++ b/t/t5515/fetch.br-config-glob-octopus\n@@ -0,0 +1,11 @@\n+# br-config-glob-octopus\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\tbranch 'master' of ../\n+8e32a6d901327a23ef831511badce7bf3bf46689\t\tbranch 'one' of ../\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\tbranch 'three' of ../\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\tbranch 'two' of ../\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\ttag 'tag-master' of ../\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\ttag 'tag-one' of ../\n+22feea448b023a2d864ef94b013735af34d238ba\tnot-for-merge\ttag 'tag-one-tree' of ../\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\ttag 'tag-three' of ../\n+0e3b14047d3ee365f4f2a1b673db059c3972589c\tnot-for-merge\ttag 'tag-three-file' of ../\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\ttag 'tag-two' of ../\ndiff --git a/t/t5515/fetch.br-config-glob-octopus_config-glob b/t/t5515/fetch.br-config-glob-octopus_config-glob\nnew file mode 100644\nindex 0000000..44bd0ec\n--- /dev/null\n+++ b/t/t5515/fetch.br-config-glob-octopus_config-glob\n@@ -0,0 +1,11 @@\n+# br-config-glob-octopus config-glob\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\tbranch 'master' of ../\n+8e32a6d901327a23ef831511badce7bf3bf46689\t\tbranch 'one' of ../\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\tbranch 'three' of ../\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\tbranch 'two' of ../\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\ttag 'tag-master' of ../\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\ttag 'tag-one' of ../\n+22feea448b023a2d864ef94b013735af34d238ba\tnot-for-merge\ttag 'tag-one-tree' of ../\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\ttag 'tag-three' of ../\n+0e3b14047d3ee365f4f2a1b673db059c3972589c\tnot-for-merge\ttag 'tag-three-file' of ../\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\ttag 'tag-two' of ../\ndiff --git a/t/t5515/fetch.br-config-glob_config-glob b/t/t5515/fetch.br-config-glob_config-glob\nnew file mode 100644\nindex 0000000..a6c20f9\n--- /dev/null\n+++ b/t/t5515/fetch.br-config-glob_config-glob\n@@ -0,0 +1,11 @@\n+# br-config-glob config-glob\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\tbranch 'master' of ../\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\tbranch 'one' of ../\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\tbranch 'three' of ../\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\tbranch 'two' of ../\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\ttag 'tag-master' of ../\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\ttag 'tag-one' of ../\n+22feea448b023a2d864ef94b013735af34d238ba\tnot-for-merge\ttag 'tag-one-tree' of ../\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\ttag 'tag-three' of ../\n+0e3b14047d3ee365f4f2a1b673db059c3972589c\tnot-for-merge\ttag 'tag-three-file' of ../\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\ttag 'tag-two' of ../\ndiff --git a/t/t5515/fetch.br-remote-explicit b/t/t5515/fetch.br-remote-explicit\nnew file mode 100644\nindex 0000000..83534d2\n--- /dev/null\n+++ b/t/t5515/fetch.br-remote-explicit\n@@ -0,0 +1,11 @@\n+# br-remote-explicit\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\t\tbranch 'master' of ../\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\tbranch 'one' of ../\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\tbranch 'two' of ../\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\tbranch 'three' of ../\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\ttag 'tag-master' of ../\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\ttag 'tag-one' of ../\n+22feea448b023a2d864ef94b013735af34d238ba\tnot-for-merge\ttag 'tag-one-tree' of ../\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\ttag 'tag-three' of ../\n+0e3b14047d3ee365f4f2a1b673db059c3972589c\tnot-for-merge\ttag 'tag-three-file' of ../\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\ttag 'tag-two' of ../\ndiff --git a/t/t5515/fetch.br-remote-explicit-merge b/t/t5515/fetch.br-remote-explicit-merge\nnew file mode 100644\nindex 0000000..a9064dd\n--- /dev/null\n+++ b/t/t5515/fetch.br-remote-explicit-merge\n@@ -0,0 +1,11 @@\n+# br-remote-explicit-merge\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\tbranch 'master' of ../\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\tbranch 'one' of ../\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\tbranch 'two' of ../\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\t\tbranch 'three' of ../\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\ttag 'tag-master' of ../\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\ttag 'tag-one' of ../\n+22feea448b023a2d864ef94b013735af34d238ba\tnot-for-merge\ttag 'tag-one-tree' of ../\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\ttag 'tag-three' of ../\n+0e3b14047d3ee365f4f2a1b673db059c3972589c\tnot-for-merge\ttag 'tag-three-file' of ../\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\ttag 'tag-two' of ../\ndiff --git a/t/t5515/fetch.br-remote-explicit-merge_remote-explicit b/t/t5515/fetch.br-remote-explicit-merge_remote-explicit\nnew file mode 100644\nindex 0000000..732a37e\n--- /dev/null\n+++ b/t/t5515/fetch.br-remote-explicit-merge_remote-explicit\n@@ -0,0 +1,11 @@\n+# br-remote-explicit-merge remote-explicit\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\tbranch 'master' of ../\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\tbranch 'one' of ../\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\tbranch 'two' of ../\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\t\tbranch 'three' of ../\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\ttag 'tag-master' of ../\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\ttag 'tag-one' of ../\n+22feea448b023a2d864ef94b013735af34d238ba\tnot-for-merge\ttag 'tag-one-tree' of ../\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\ttag 'tag-three' of ../\n+0e3b14047d3ee365f4f2a1b673db059c3972589c\tnot-for-merge\ttag 'tag-three-file' of ../\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\ttag 'tag-two' of ../\ndiff --git a/t/t5515/fetch.br-remote-explicit-octopus b/t/t5515/fetch.br-remote-explicit-octopus\nnew file mode 100644\nindex 0000000..ecf020d\n--- /dev/null\n+++ b/t/t5515/fetch.br-remote-explicit-octopus\n@@ -0,0 +1,11 @@\n+# br-remote-explicit-octopus\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\tbranch 'master' of ../\n+8e32a6d901327a23ef831511badce7bf3bf46689\t\tbranch 'one' of ../\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\t\tbranch 'two' of ../\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\tbranch 'three' of ../\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\ttag 'tag-master' of ../\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\ttag 'tag-one' of ../\n+22feea448b023a2d864ef94b013735af34d238ba\tnot-for-merge\ttag 'tag-one-tree' of ../\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\ttag 'tag-three' of ../\n+0e3b14047d3ee365f4f2a1b673db059c3972589c\tnot-for-merge\ttag 'tag-three-file' of ../\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\ttag 'tag-two' of ../\ndiff --git a/t/t5515/fetch.br-remote-explicit-octopus_remote-explicit b/t/t5515/fetch.br-remote-explicit-octopus_remote-explicit\nnew file mode 100644\nindex 0000000..af77531\n--- /dev/null\n+++ b/t/t5515/fetch.br-remote-explicit-octopus_remote-explicit\n@@ -0,0 +1,11 @@\n+# br-remote-explicit-octopus remote-explicit\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\tbranch 'master' of ../\n+8e32a6d901327a23ef831511badce7bf3bf46689\t\tbranch 'one' of ../\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\t\tbranch 'two' of ../\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\tbranch 'three' of ../\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\ttag 'tag-master' of ../\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\ttag 'tag-one' of ../\n+22feea448b023a2d864ef94b013735af34d238ba\tnot-for-merge\ttag 'tag-one-tree' of ../\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\ttag 'tag-three' of ../\n+0e3b14047d3ee365f4f2a1b673db059c3972589c\tnot-for-merge\ttag 'tag-three-file' of ../\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\ttag 'tag-two' of ../\ndiff --git a/t/t5515/fetch.br-remote-explicit_remote-explicit b/t/t5515/fetch.br-remote-explicit_remote-explicit\nnew file mode 100644\nindex 0000000..51fae56\n--- /dev/null\n+++ b/t/t5515/fetch.br-remote-explicit_remote-explicit\n@@ -0,0 +1,11 @@\n+# br-remote-explicit remote-explicit\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\t\tbranch 'master' of ../\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\tbranch 'one' of ../\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\tbranch 'two' of ../\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\tbranch 'three' of ../\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\ttag 'tag-master' of ../\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\ttag 'tag-one' of ../\n+22feea448b023a2d864ef94b013735af34d238ba\tnot-for-merge\ttag 'tag-one-tree' of ../\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\ttag 'tag-three' of ../\n+0e3b14047d3ee365f4f2a1b673db059c3972589c\tnot-for-merge\ttag 'tag-three-file' of ../\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\ttag 'tag-two' of ../\ndiff --git a/t/t5515/fetch.br-remote-glob b/t/t5515/fetch.br-remote-glob\nnew file mode 100644\nindex 0000000..94e6ad3\n--- /dev/null\n+++ b/t/t5515/fetch.br-remote-glob\n@@ -0,0 +1,11 @@\n+# br-remote-glob\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\tbranch 'master' of ../\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\tbranch 'one' of ../\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\tbranch 'three' of ../\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\tbranch 'two' of ../\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\ttag 'tag-master' of ../\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\ttag 'tag-one' of ../\n+22feea448b023a2d864ef94b013735af34d238ba\tnot-for-merge\ttag 'tag-one-tree' of ../\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\ttag 'tag-three' of ../\n+0e3b14047d3ee365f4f2a1b673db059c3972589c\tnot-for-merge\ttag 'tag-three-file' of ../\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\ttag 'tag-two' of ../\ndiff --git a/t/t5515/fetch.br-remote-glob-merge b/t/t5515/fetch.br-remote-glob-merge\nnew file mode 100644\nindex 0000000..09362e2\n--- /dev/null\n+++ b/t/t5515/fetch.br-remote-glob-merge\n@@ -0,0 +1,11 @@\n+# br-remote-glob-merge\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\tbranch 'master' of ../\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\tbranch 'one' of ../\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\t\tbranch 'three' of ../\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\tbranch 'two' of ../\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\ttag 'tag-master' of ../\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\ttag 'tag-one' of ../\n+22feea448b023a2d864ef94b013735af34d238ba\tnot-for-merge\ttag 'tag-one-tree' of ../\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\ttag 'tag-three' of ../\n+0e3b14047d3ee365f4f2a1b673db059c3972589c\tnot-for-merge\ttag 'tag-three-file' of ../\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\ttag 'tag-two' of ../\ndiff --git a/t/t5515/fetch.br-remote-glob-merge_remote-glob b/t/t5515/fetch.br-remote-glob-merge_remote-glob\nnew file mode 100644\nindex 0000000..e2eabec\n--- /dev/null\n+++ b/t/t5515/fetch.br-remote-glob-merge_remote-glob\n@@ -0,0 +1,11 @@\n+# br-remote-glob-merge remote-glob\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\tbranch 'master' of ../\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\tbranch 'one' of ../\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\t\tbranch 'three' of ../\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\tbranch 'two' of ../\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\ttag 'tag-master' of ../\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\ttag 'tag-one' of ../\n+22feea448b023a2d864ef94b013735af34d238ba\tnot-for-merge\ttag 'tag-one-tree' of ../\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\ttag 'tag-three' of ../\n+0e3b14047d3ee365f4f2a1b673db059c3972589c\tnot-for-merge\ttag 'tag-three-file' of ../\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\ttag 'tag-two' of ../\ndiff --git a/t/t5515/fetch.br-remote-glob-octopus b/t/t5515/fetch.br-remote-glob-octopus\nnew file mode 100644\nindex 0000000..c1554f8\n--- /dev/null\n+++ b/t/t5515/fetch.br-remote-glob-octopus\n@@ -0,0 +1,11 @@\n+# br-remote-glob-octopus\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\tbranch 'master' of ../\n+8e32a6d901327a23ef831511badce7bf3bf46689\t\tbranch 'one' of ../\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\tbranch 'three' of ../\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\tbranch 'two' of ../\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\ttag 'tag-master' of ../\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\ttag 'tag-one' of ../\n+22feea448b023a2d864ef94b013735af34d238ba\tnot-for-merge\ttag 'tag-one-tree' of ../\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\ttag 'tag-three' of ../\n+0e3b14047d3ee365f4f2a1b673db059c3972589c\tnot-for-merge\ttag 'tag-three-file' of ../\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\ttag 'tag-two' of ../\ndiff --git a/t/t5515/fetch.br-remote-glob-octopus_remote-glob b/t/t5515/fetch.br-remote-glob-octopus_remote-glob\nnew file mode 100644\nindex 0000000..e613434\n--- /dev/null\n+++ b/t/t5515/fetch.br-remote-glob-octopus_remote-glob\n@@ -0,0 +1,11 @@\n+# br-remote-glob-octopus remote-glob\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\tbranch 'master' of ../\n+8e32a6d901327a23ef831511badce7bf3bf46689\t\tbranch 'one' of ../\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\tbranch 'three' of ../\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\tbranch 'two' of ../\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\ttag 'tag-master' of ../\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\ttag 'tag-one' of ../\n+22feea448b023a2d864ef94b013735af34d238ba\tnot-for-merge\ttag 'tag-one-tree' of ../\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\ttag 'tag-three' of ../\n+0e3b14047d3ee365f4f2a1b673db059c3972589c\tnot-for-merge\ttag 'tag-three-file' of ../\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\ttag 'tag-two' of ../\ndiff --git a/t/t5515/fetch.br-remote-glob_remote-glob b/t/t5515/fetch.br-remote-glob_remote-glob\nnew file mode 100644\nindex 0000000..646dbc8\n--- /dev/null\n+++ b/t/t5515/fetch.br-remote-glob_remote-glob\n@@ -0,0 +1,11 @@\n+# br-remote-glob remote-glob\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\tbranch 'master' of ../\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\tbranch 'one' of ../\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\tbranch 'three' of ../\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\tbranch 'two' of ../\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\ttag 'tag-master' of ../\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\ttag 'tag-one' of ../\n+22feea448b023a2d864ef94b013735af34d238ba\tnot-for-merge\ttag 'tag-one-tree' of ../\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\ttag 'tag-three' of ../\n+0e3b14047d3ee365f4f2a1b673db059c3972589c\tnot-for-merge\ttag 'tag-three-file' of ../\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\ttag 'tag-two' of ../\ndiff --git a/t/t5515/fetch.br-unconfig b/t/t5515/fetch.br-unconfig\nnew file mode 100644\nindex 0000000..65ce6d9\n--- /dev/null\n+++ b/t/t5515/fetch.br-unconfig\n@@ -0,0 +1,11 @@\n+# br-unconfig\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\tbranch 'master' of ../\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\tbranch 'one' of ../\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\tbranch 'three' of ../\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\tbranch 'two' of ../\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\ttag 'tag-master' of ../\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\ttag 'tag-one' of ../\n+22feea448b023a2d864ef94b013735af34d238ba\tnot-for-merge\ttag 'tag-one-tree' of ../\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\ttag 'tag-three' of ../\n+0e3b14047d3ee365f4f2a1b673db059c3972589c\tnot-for-merge\ttag 'tag-three-file' of ../\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\ttag 'tag-two' of ../\ndiff --git a/t/t5515/fetch.br-unconfig_--tags_.._.git b/t/t5515/fetch.br-unconfig_--tags_.._.git\nnew file mode 100644\nindex 0000000..8258c80\n--- /dev/null\n+++ b/t/t5515/fetch.br-unconfig_--tags_.._.git\n@@ -0,0 +1,7 @@\n+# br-unconfig --tags ../.git\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\ttag 'tag-master' of ../\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\ttag 'tag-one' of ../\n+22feea448b023a2d864ef94b013735af34d238ba\tnot-for-merge\ttag 'tag-one-tree' of ../\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\ttag 'tag-three' of ../\n+0e3b14047d3ee365f4f2a1b673db059c3972589c\tnot-for-merge\ttag 'tag-three-file' of ../\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\ttag 'tag-two' of ../\ndiff --git a/t/t5515/fetch.br-unconfig_.._.git_one b/t/t5515/fetch.br-unconfig_.._.git_one\nnew file mode 100644\nindex 0000000..11eb5a6\n--- /dev/null\n+++ b/t/t5515/fetch.br-unconfig_.._.git_one\n@@ -0,0 +1,2 @@\n+# br-unconfig ../.git one\n+8e32a6d901327a23ef831511badce7bf3bf46689\t\tbranch 'one' of ../\ndiff --git a/t/t5515/fetch.br-unconfig_.._.git_one_tag_tag-one_tag_tag-three-file b/t/t5515/fetch.br-unconfig_.._.git_one_tag_tag-one_tag_tag-three-file\nnew file mode 100644\nindex 0000000..f02bab2\n--- /dev/null\n+++ b/t/t5515/fetch.br-unconfig_.._.git_one_tag_tag-one_tag_tag-three-file\n@@ -0,0 +1,8 @@\n+# br-unconfig ../.git one tag tag-one tag tag-three-file\n+8e32a6d901327a23ef831511badce7bf3bf46689\t\tbranch 'one' of ../\n+8e32a6d901327a23ef831511badce7bf3bf46689\t\ttag 'tag-one' of ../\n+0e3b14047d3ee365f4f2a1b673db059c3972589c\tnot-for-merge\ttag 'tag-three-file' of ../\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\ttag 'tag-master' of ../\n+22feea448b023a2d864ef94b013735af34d238ba\tnot-for-merge\ttag 'tag-one-tree' of ../\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\ttag 'tag-three' of ../\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\ttag 'tag-two' of ../\ndiff --git a/t/t5515/fetch.br-unconfig_.._.git_one_two b/t/t5515/fetch.br-unconfig_.._.git_one_two\nnew file mode 100644\nindex 0000000..3f1be22\n--- /dev/null\n+++ b/t/t5515/fetch.br-unconfig_.._.git_one_two\n@@ -0,0 +1,3 @@\n+# br-unconfig ../.git one two\n+8e32a6d901327a23ef831511badce7bf3bf46689\t\tbranch 'one' of ../\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\t\tbranch 'two' of ../\ndiff --git a/t/t5515/fetch.br-unconfig_.._.git_tag_tag-one-tree_tag_tag-three-file b/t/t5515/fetch.br-unconfig_.._.git_tag_tag-one-tree_tag_tag-three-file\nnew file mode 100644\nindex 0000000..85de411\n--- /dev/null\n+++ b/t/t5515/fetch.br-unconfig_.._.git_tag_tag-one-tree_tag_tag-three-file\n@@ -0,0 +1,7 @@\n+# br-unconfig ../.git tag tag-one-tree tag tag-three-file\n+22feea448b023a2d864ef94b013735af34d238ba\tnot-for-merge\ttag 'tag-one-tree' of ../\n+0e3b14047d3ee365f4f2a1b673db059c3972589c\tnot-for-merge\ttag 'tag-three-file' of ../\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\ttag 'tag-master' of ../\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\ttag 'tag-one' of ../\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\ttag 'tag-three' of ../\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\ttag 'tag-two' of ../\ndiff --git a/t/t5515/fetch.br-unconfig_.._.git_tag_tag-one_tag_tag-three b/t/t5515/fetch.br-unconfig_.._.git_tag_tag-one_tag_tag-three\nnew file mode 100644\nindex 0000000..0da2337\n--- /dev/null\n+++ b/t/t5515/fetch.br-unconfig_.._.git_tag_tag-one_tag_tag-three\n@@ -0,0 +1,7 @@\n+# br-unconfig ../.git tag tag-one tag tag-three\n+8e32a6d901327a23ef831511badce7bf3bf46689\t\ttag 'tag-one' of ../\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\t\ttag 'tag-three' of ../\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\ttag 'tag-master' of ../\n+22feea448b023a2d864ef94b013735af34d238ba\tnot-for-merge\ttag 'tag-one-tree' of ../\n+0e3b14047d3ee365f4f2a1b673db059c3972589c\tnot-for-merge\ttag 'tag-three-file' of ../\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\ttag 'tag-two' of ../\ndiff --git a/t/t5515/fetch.br-unconfig_branches-default b/t/t5515/fetch.br-unconfig_branches-default\nnew file mode 100644\nindex 0000000..fc7041e\n--- /dev/null\n+++ b/t/t5515/fetch.br-unconfig_branches-default\n@@ -0,0 +1,8 @@\n+# br-unconfig branches-default\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\t\tbranch 'master' of ../\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\ttag 'tag-master' of ../\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\ttag 'tag-one' of ../\n+22feea448b023a2d864ef94b013735af34d238ba\tnot-for-merge\ttag 'tag-one-tree' of ../\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\ttag 'tag-three' of ../\n+0e3b14047d3ee365f4f2a1b673db059c3972589c\tnot-for-merge\ttag 'tag-three-file' of ../\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\ttag 'tag-two' of ../\ndiff --git a/t/t5515/fetch.br-unconfig_branches-one b/t/t5515/fetch.br-unconfig_branches-one\nnew file mode 100644\nindex 0000000..e94cde7\n--- /dev/null\n+++ b/t/t5515/fetch.br-unconfig_branches-one\n@@ -0,0 +1,8 @@\n+# br-unconfig branches-one\n+8e32a6d901327a23ef831511badce7bf3bf46689\t\tbranch 'one' of ../\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\ttag 'tag-master' of ../\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\ttag 'tag-one' of ../\n+22feea448b023a2d864ef94b013735af34d238ba\tnot-for-merge\ttag 'tag-one-tree' of ../\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\ttag 'tag-three' of ../\n+0e3b14047d3ee365f4f2a1b673db059c3972589c\tnot-for-merge\ttag 'tag-three-file' of ../\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\ttag 'tag-two' of ../\ndiff --git a/t/t5515/fetch.br-unconfig_config-explicit b/t/t5515/fetch.br-unconfig_config-explicit\nnew file mode 100644\nindex 0000000..01a283e\n--- /dev/null\n+++ b/t/t5515/fetch.br-unconfig_config-explicit\n@@ -0,0 +1,11 @@\n+# br-unconfig config-explicit\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\t\tbranch 'master' of ../\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\tbranch 'one' of ../\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\tbranch 'two' of ../\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\tbranch 'three' of ../\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\ttag 'tag-master' of ../\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\ttag 'tag-one' of ../\n+22feea448b023a2d864ef94b013735af34d238ba\tnot-for-merge\ttag 'tag-one-tree' of ../\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\ttag 'tag-three' of ../\n+0e3b14047d3ee365f4f2a1b673db059c3972589c\tnot-for-merge\ttag 'tag-three-file' of ../\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\ttag 'tag-two' of ../\ndiff --git a/t/t5515/fetch.br-unconfig_config-glob b/t/t5515/fetch.br-unconfig_config-glob\nnew file mode 100644\nindex 0000000..3a556c5\n--- /dev/null\n+++ b/t/t5515/fetch.br-unconfig_config-glob\n@@ -0,0 +1,11 @@\n+# br-unconfig config-glob\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\tbranch 'master' of ../\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\tbranch 'one' of ../\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\tbranch 'three' of ../\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\tbranch 'two' of ../\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\ttag 'tag-master' of ../\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\ttag 'tag-one' of ../\n+22feea448b023a2d864ef94b013735af34d238ba\tnot-for-merge\ttag 'tag-one-tree' of ../\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\ttag 'tag-three' of ../\n+0e3b14047d3ee365f4f2a1b673db059c3972589c\tnot-for-merge\ttag 'tag-three-file' of ../\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\ttag 'tag-two' of ../\ndiff --git a/t/t5515/fetch.br-unconfig_remote-explicit b/t/t5515/fetch.br-unconfig_remote-explicit\nnew file mode 100644\nindex 0000000..db216df\n--- /dev/null\n+++ b/t/t5515/fetch.br-unconfig_remote-explicit\n@@ -0,0 +1,11 @@\n+# br-unconfig remote-explicit\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\t\tbranch 'master' of ../\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\tbranch 'one' of ../\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\tbranch 'two' of ../\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\tbranch 'three' of ../\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\ttag 'tag-master' of ../\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\ttag 'tag-one' of ../\n+22feea448b023a2d864ef94b013735af34d238ba\tnot-for-merge\ttag 'tag-one-tree' of ../\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\ttag 'tag-three' of ../\n+0e3b14047d3ee365f4f2a1b673db059c3972589c\tnot-for-merge\ttag 'tag-three-file' of ../\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\ttag 'tag-two' of ../\ndiff --git a/t/t5515/fetch.br-unconfig_remote-glob b/t/t5515/fetch.br-unconfig_remote-glob\nnew file mode 100644\nindex 0000000..aee65c2\n--- /dev/null\n+++ b/t/t5515/fetch.br-unconfig_remote-glob\n@@ -0,0 +1,11 @@\n+# br-unconfig remote-glob\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\tbranch 'master' of ../\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\tbranch 'one' of ../\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\tbranch 'three' of ../\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\tbranch 'two' of ../\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\ttag 'tag-master' of ../\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\ttag 'tag-one' of ../\n+22feea448b023a2d864ef94b013735af34d238ba\tnot-for-merge\ttag 'tag-one-tree' of ../\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\ttag 'tag-three' of ../\n+0e3b14047d3ee365f4f2a1b673db059c3972589c\tnot-for-merge\ttag 'tag-three-file' of ../\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\ttag 'tag-two' of ../\ndiff --git a/t/t5515/fetch.master b/t/t5515/fetch.master\nnew file mode 100644\nindex 0000000..950fd07\n--- /dev/null\n+++ b/t/t5515/fetch.master\n@@ -0,0 +1,11 @@\n+# master\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\tbranch 'master' of ../\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\tbranch 'one' of ../\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\tbranch 'three' of ../\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\tbranch 'two' of ../\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\ttag 'tag-master' of ../\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\ttag 'tag-one' of ../\n+22feea448b023a2d864ef94b013735af34d238ba\tnot-for-merge\ttag 'tag-one-tree' of ../\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\ttag 'tag-three' of ../\n+0e3b14047d3ee365f4f2a1b673db059c3972589c\tnot-for-merge\ttag 'tag-three-file' of ../\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\ttag 'tag-two' of ../\ndiff --git a/t/t5515/fetch.master_--tags_.._.git b/t/t5515/fetch.master_--tags_.._.git\nnew file mode 100644\nindex 0000000..0e59950\n--- /dev/null\n+++ b/t/t5515/fetch.master_--tags_.._.git\n@@ -0,0 +1,7 @@\n+# master --tags ../.git\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\ttag 'tag-master' of ../\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\ttag 'tag-one' of ../\n+22feea448b023a2d864ef94b013735af34d238ba\tnot-for-merge\ttag 'tag-one-tree' of ../\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\ttag 'tag-three' of ../\n+0e3b14047d3ee365f4f2a1b673db059c3972589c\tnot-for-merge\ttag 'tag-three-file' of ../\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\ttag 'tag-two' of ../\ndiff --git a/t/t5515/fetch.master_.._.git_one b/t/t5515/fetch.master_.._.git_one\nnew file mode 100644\nindex 0000000..35deddb\n--- /dev/null\n+++ b/t/t5515/fetch.master_.._.git_one\n@@ -0,0 +1,2 @@\n+# master ../.git one\n+8e32a6d901327a23ef831511badce7bf3bf46689\t\tbranch 'one' of ../\ndiff --git a/t/t5515/fetch.master_.._.git_one_tag_tag-one_tag_tag-three-file b/t/t5515/fetch.master_.._.git_one_tag_tag-one_tag_tag-three-file\nnew file mode 100644\nindex 0000000..8286852\n--- /dev/null\n+++ b/t/t5515/fetch.master_.._.git_one_tag_tag-one_tag_tag-three-file\n@@ -0,0 +1,8 @@\n+# master ../.git one tag tag-one tag tag-three-file\n+8e32a6d901327a23ef831511badce7bf3bf46689\t\tbranch 'one' of ../\n+8e32a6d901327a23ef831511badce7bf3bf46689\t\ttag 'tag-one' of ../\n+0e3b14047d3ee365f4f2a1b673db059c3972589c\tnot-for-merge\ttag 'tag-three-file' of ../\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\ttag 'tag-master' of ../\n+22feea448b023a2d864ef94b013735af34d238ba\tnot-for-merge\ttag 'tag-one-tree' of ../\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\ttag 'tag-three' of ../\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\ttag 'tag-two' of ../\ndiff --git a/t/t5515/fetch.master_.._.git_one_two b/t/t5515/fetch.master_.._.git_one_two\nnew file mode 100644\nindex 0000000..35ec578\n--- /dev/null\n+++ b/t/t5515/fetch.master_.._.git_one_two\n@@ -0,0 +1,3 @@\n+# master ../.git one two\n+8e32a6d901327a23ef831511badce7bf3bf46689\t\tbranch 'one' of ../\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\t\tbranch 'two' of ../\ndiff --git a/t/t5515/fetch.master_.._.git_tag_tag-one-tree_tag_tag-three-file b/t/t5515/fetch.master_.._.git_tag_tag-one-tree_tag_tag-three-file\nnew file mode 100644\nindex 0000000..2e133ef\n--- /dev/null\n+++ b/t/t5515/fetch.master_.._.git_tag_tag-one-tree_tag_tag-three-file\n@@ -0,0 +1,7 @@\n+# master ../.git tag tag-one-tree tag tag-three-file\n+22feea448b023a2d864ef94b013735af34d238ba\tnot-for-merge\ttag 'tag-one-tree' of ../\n+0e3b14047d3ee365f4f2a1b673db059c3972589c\tnot-for-merge\ttag 'tag-three-file' of ../\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\ttag 'tag-master' of ../\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\ttag 'tag-one' of ../\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\ttag 'tag-three' of ../\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\ttag 'tag-two' of ../\ndiff --git a/t/t5515/fetch.master_.._.git_tag_tag-one_tag_tag-three b/t/t5515/fetch.master_.._.git_tag_tag-one_tag_tag-three\nnew file mode 100644\nindex 0000000..92b18b4\n--- /dev/null\n+++ b/t/t5515/fetch.master_.._.git_tag_tag-one_tag_tag-three\n@@ -0,0 +1,7 @@\n+# master ../.git tag tag-one tag tag-three\n+8e32a6d901327a23ef831511badce7bf3bf46689\t\ttag 'tag-one' of ../\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\t\ttag 'tag-three' of ../\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\ttag 'tag-master' of ../\n+22feea448b023a2d864ef94b013735af34d238ba\tnot-for-merge\ttag 'tag-one-tree' of ../\n+0e3b14047d3ee365f4f2a1b673db059c3972589c\tnot-for-merge\ttag 'tag-three-file' of ../\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\ttag 'tag-two' of ../\ndiff --git a/t/t5515/fetch.master_branches-default b/t/t5515/fetch.master_branches-default\nnew file mode 100644\nindex 0000000..603d6d2\n--- /dev/null\n+++ b/t/t5515/fetch.master_branches-default\n@@ -0,0 +1,8 @@\n+# master branches-default\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\t\tbranch 'master' of ../\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\ttag 'tag-master' of ../\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\ttag 'tag-one' of ../\n+22feea448b023a2d864ef94b013735af34d238ba\tnot-for-merge\ttag 'tag-one-tree' of ../\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\ttag 'tag-three' of ../\n+0e3b14047d3ee365f4f2a1b673db059c3972589c\tnot-for-merge\ttag 'tag-three-file' of ../\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\ttag 'tag-two' of ../\ndiff --git a/t/t5515/fetch.master_branches-one b/t/t5515/fetch.master_branches-one\nnew file mode 100644\nindex 0000000..fe9bb0b\n--- /dev/null\n+++ b/t/t5515/fetch.master_branches-one\n@@ -0,0 +1,8 @@\n+# master branches-one\n+8e32a6d901327a23ef831511badce7bf3bf46689\t\tbranch 'one' of ../\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\ttag 'tag-master' of ../\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\ttag 'tag-one' of ../\n+22feea448b023a2d864ef94b013735af34d238ba\tnot-for-merge\ttag 'tag-one-tree' of ../\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\ttag 'tag-three' of ../\n+0e3b14047d3ee365f4f2a1b673db059c3972589c\tnot-for-merge\ttag 'tag-three-file' of ../\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\ttag 'tag-two' of ../\ndiff --git a/t/t5515/fetch.master_config-explicit b/t/t5515/fetch.master_config-explicit\nnew file mode 100644\nindex 0000000..4be97c7\n--- /dev/null\n+++ b/t/t5515/fetch.master_config-explicit\n@@ -0,0 +1,11 @@\n+# master config-explicit\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\t\tbranch 'master' of ../\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\tbranch 'one' of ../\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\tbranch 'two' of ../\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\tbranch 'three' of ../\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\ttag 'tag-master' of ../\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\ttag 'tag-one' of ../\n+22feea448b023a2d864ef94b013735af34d238ba\tnot-for-merge\ttag 'tag-one-tree' of ../\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\ttag 'tag-three' of ../\n+0e3b14047d3ee365f4f2a1b673db059c3972589c\tnot-for-merge\ttag 'tag-three-file' of ../\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\ttag 'tag-two' of ../\ndiff --git a/t/t5515/fetch.master_config-glob b/t/t5515/fetch.master_config-glob\nnew file mode 100644\nindex 0000000..cb0726f\n--- /dev/null\n+++ b/t/t5515/fetch.master_config-glob\n@@ -0,0 +1,11 @@\n+# master config-glob\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\tbranch 'master' of ../\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\tbranch 'one' of ../\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\tbranch 'three' of ../\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\tbranch 'two' of ../\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\ttag 'tag-master' of ../\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\ttag 'tag-one' of ../\n+22feea448b023a2d864ef94b013735af34d238ba\tnot-for-merge\ttag 'tag-one-tree' of ../\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\ttag 'tag-three' of ../\n+0e3b14047d3ee365f4f2a1b673db059c3972589c\tnot-for-merge\ttag 'tag-three-file' of ../\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\ttag 'tag-two' of ../\ndiff --git a/t/t5515/fetch.master_remote-explicit b/t/t5515/fetch.master_remote-explicit\nnew file mode 100644\nindex 0000000..44a1ca8\n--- /dev/null\n+++ b/t/t5515/fetch.master_remote-explicit\n@@ -0,0 +1,11 @@\n+# master remote-explicit\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\t\tbranch 'master' of ../\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\tbranch 'one' of ../\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\tbranch 'two' of ../\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\tbranch 'three' of ../\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\ttag 'tag-master' of ../\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\ttag 'tag-one' of ../\n+22feea448b023a2d864ef94b013735af34d238ba\tnot-for-merge\ttag 'tag-one-tree' of ../\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\ttag 'tag-three' of ../\n+0e3b14047d3ee365f4f2a1b673db059c3972589c\tnot-for-merge\ttag 'tag-three-file' of ../\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\ttag 'tag-two' of ../\ndiff --git a/t/t5515/fetch.master_remote-glob b/t/t5515/fetch.master_remote-glob\nnew file mode 100644\nindex 0000000..724e8db\n--- /dev/null\n+++ b/t/t5515/fetch.master_remote-glob\n@@ -0,0 +1,11 @@\n+# master remote-glob\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\tbranch 'master' of ../\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\tbranch 'one' of ../\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\tbranch 'three' of ../\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\tbranch 'two' of ../\n+754b754407bf032e9a2f9d5a9ad05ca79a6b228f\tnot-for-merge\ttag 'tag-master' of ../\n+8e32a6d901327a23ef831511badce7bf3bf46689\tnot-for-merge\ttag 'tag-one' of ../\n+22feea448b023a2d864ef94b013735af34d238ba\tnot-for-merge\ttag 'tag-one-tree' of ../\n+0567da4d5edd2ff4bb292a465ba9e64dcad9536b\tnot-for-merge\ttag 'tag-three' of ../\n+0e3b14047d3ee365f4f2a1b673db059c3972589c\tnot-for-merge\ttag 'tag-three-file' of ../\n+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\tnot-for-merge\ttag 'tag-two' of ../\n-- \n1.5.0.2.878.g38f47\n"},{"id":"36294","messageId":"7vslck14ly.fsf@assigned-by-dhcp.cox.net","threadId":"7080","inReplyTo":"87abyskt6k.fsf@gmail.com","subject":"Re: [PATCHv2] t/t5515-fetch-merge-logic.sh: Added tests for the merge login in git-fetch","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2007-03-05T08:23:05Z","receivedAt":"2007-03-05T08:23:05Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Santi Béjar writes:\n\n> P.D.: When sended this way the From: must be quoted or in UTF-8?\n\nAbsolutely not.\n"},{"id":"36297","messageId":"7vodn814cz.fsf@assigned-by-dhcp.cox.net","threadId":"7080","inReplyTo":"7vslck14ly.fsf@assigned-by-dhcp.cox.net","subject":"Re: [PATCHv2] t/t5515-fetch-merge-logic.sh: Added tests for the merge login in git-fetch","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2007-03-05T08:28:28Z","receivedAt":"2007-03-05T08:28:28Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Junio C Hamano writes:\n\n> Santi Béjar writes:\n>\n>> P.D.: When sended this way the From: must be quoted or in UTF-8?\n>\n> Absolutely not.\n\nBut there is no need to resend. I'll apply it to 'master'\nbefore going to bed.\n\nThanks.\n"},{"id":"36298","messageId":"20070305082846.GC12104@always.joy.eth.net","threadId":"7080","inReplyTo":"7vslck14ly.fsf@assigned-by-dhcp.cox.net","subject":"Re: [PATCHv2] t/t5515-fetch-merge-logic.sh: Added tests for the merge login in git-fetch","fromName":"Joshua N Pritikin","fromEmail":"jpritikin@pobox.com","sentAt":"2007-03-05T08:28:46Z","receivedAt":"2007-03-05T08:28:46Z","isPatch":false,"sender":{"key":"jpritikin@pobox.com","avatar":"https://gravatar.com/avatar/3f2561fdd7efac4e127dc65ac7e06f044069c115dcc94d0ac540f4126d47759d?d=mp&s=160"},"body":"On Mon, Mar 05, 2007 at 12:23:05AM -0800, Junio C Hamano wrote:\n> Santi Béjar writes:\n> > P.D.: When sended this way the From: must be quoted or in UTF-8?\n> \n> Absolutely not.\n\nI think Junio meant that UTF-8 is OK. At least it is okay here in mutt.\n"},{"id":"36300","messageId":"8aa486160703050036r42701933k321e93d166e78575@mail.gmail.com","threadId":"7080","inReplyTo":"20070305082846.GC12104@always.joy.eth.net","subject":"Re: [PATCHv2] t/t5515-fetch-merge-logic.sh: Added tests for the merge login in git-fetch","fromName":"Santi Béjar","fromEmail":"sbejar@gmail.com","sentAt":"2007-03-05T08:36:27Z","receivedAt":"2007-03-05T08:36:27Z","isPatch":false,"sender":{"key":"santi@agolina.net","avatar":null},"body":"On 3/5/07, Joshua N Pritikin wrote:\n> On Mon, Mar 05, 2007 at 12:23:05AM -0800, Junio C Hamano wrote:\n> > Santi Béjar writes:\n> > > P.D.: When sended this way the From: must be quoted or in UTF-8?\n> >\n> > Absolutely not.\n>\n> I think Junio meant that UTF-8 is OK. At least it is okay here in mutt.\n\nOK, thanks. So the next question is if git-format-patch needs a flag\nto indicate that?\n\n--in-body?\n\nSanti\n"},{"id":"36301","messageId":"7vk5xw13xt.fsf@assigned-by-dhcp.cox.net","threadId":"7080","inReplyTo":"20070305082846.GC12104@always.joy.eth.net","subject":"Re: [PATCHv2] t/t5515-fetch-merge-logic.sh: Added tests for the merge login in git-fetch","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2007-03-05T08:37:34Z","receivedAt":"2007-03-05T08:37:34Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Joshua N Pritikin writes:\n\n> On Mon, Mar 05, 2007 at 12:23:05AM -0800, Junio C Hamano wrote:\n>> Santi Béjar writes:\n>> > P.D.: When sended this way the From: must be quoted or in UTF-8?\n>> \n>> Absolutely not.\n>\n> I think Junio meant that UTF-8 is OK. At least it is okay here in mutt.\n\nCorrect. Sorry to be too terse. It is my bad habit I cannot\nshake off. My apologies to Santi and you for clarifying.\n\nWhen you override the author name with an in-body From: line,\nthat line is just part of the body text and you do not have to\n(and you shouldn't) quote as in the real From: header.\n"},{"id":"36302","messageId":"7vfy8k13t0.fsf@assigned-by-dhcp.cox.net","threadId":"7080","inReplyTo":"8aa486160703050036r42701933k321e93d166e78575@mail.gmail.com","subject":"Re: [PATCHv2] t/t5515-fetch-merge-logic.sh: Added tests for the merge login in git-fetch","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2007-03-05T08:40:27Z","receivedAt":"2007-03-05T08:40:27Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Santi Béjar\" writes:\n\n> On 3/5/07, Joshua N Pritikin wrote:\n>> On Mon, Mar 05, 2007 at 12:23:05AM -0800, Junio C Hamano wrote:\n>> > Santi Béjar writes:\n>> > > P.D.: When sended this way the From: must be quoted or in UTF-8?\n>> >\n>> > Absolutely not.\n>>\n>> I think Junio meant that UTF-8 is OK. At least it is okay here in mutt.\n>\n> OK, thanks. So the next question is if git-format-patch needs a flag\n> to indicate that?\n\nI do not think so. It is a tool to produce a fake mailbox, and\nwhen it says \"From: \" it really means it is producing the header\nline.\n"}]}