t/t5515-fetch-merge-logic.sh: Added tests for the merge login in git-fetch

PATCH In review Santi Béjar 3 participants 10 messages Jun 15, 2016

lore

Share & tools

lore

Santi Béjar

author

2016-06-15 22:42 UTC #0 lore raw

PATCH v2 1/1 t/t5515-fetch-merge-logic.sh: Added tests for the merge login in git-fetch

Signed-off-by Santi Béjar <[email protected]>

---
Hi *,

it is a much reduced version (63 instead of 400 tests) but contains
also tests for the fetched tags (missing anything else?). I think it is suitable to be included.

Santi

 t/t5515-fetch-merge-logic.sh                       |  160 ++++++++++++++++++++
 t/t5515/fetch.br-branches-default                  |    8 +
 t/t5515/fetch.br-branches-default-merge            |    8 +
 ...etch.br-branches-default-merge_branches-default |    8 +
 t/t5515/fetch.br-branches-default-octopus          |    8 +
 ...ch.br-branches-default-octopus_branches-default |    8 +
 t/t5515/fetch.br-branches-default_branches-default |    8 +
 t/t5515/fetch.br-branches-one                      |    8 +
 t/t5515/fetch.br-branches-one-merge                |    8 +
 t/t5515/fetch.br-branches-one-merge_branches-one   |    8 +
 t/t5515/fetch.br-branches-one-octopus              |    8 +
 t/t5515/fetch.br-branches-one-octopus_branches-one |    8 +
 t/t5515/fetch.br-branches-one_branches-one         |    8 +
 t/t5515/fetch.br-config-explicit                   |   11 ++
 t/t5515/fetch.br-config-explicit-merge             |   11 ++
 .../fetch.br-config-explicit-merge_config-explicit |   11 ++
 t/t5515/fetch.br-config-explicit-octopus           |   11 ++
 ...etch.br-config-explicit-octopus_config-explicit |   11 ++
 t/t5515/fetch.br-config-explicit_config-explicit   |   11 ++
 t/t5515/fetch.br-config-glob                       |   11 ++
 t/t5515/fetch.br-config-glob-merge                 |   11 ++
 t/t5515/fetch.br-config-glob-merge_config-glob     |   11 ++
 t/t5515/fetch.br-config-glob-octopus               |   11 ++
 t/t5515/fetch.br-config-glob-octopus_config-glob   |   11 ++
 t/t5515/fetch.br-config-glob_config-glob           |   11 ++
 t/t5515/fetch.br-remote-explicit                   |   11 ++
 t/t5515/fetch.br-remote-explicit-merge             |   11 ++
 .../fetch.br-remote-explicit-merge_remote-explicit |   11 ++
 t/t5515/fetch.br-remote-explicit-octopus           |   11 ++
 ...etch.br-remote-explicit-octopus_remote-explicit |   11 ++
 t/t5515/fetch.br-remote-explicit_remote-explicit   |   11 ++
 t/t5515/fetch.br-remote-glob                       |   11 ++
 t/t5515/fetch.br-remote-glob-merge                 |   11 ++
 t/t5515/fetch.br-remote-glob-merge_remote-glob     |   11 ++
 t/t5515/fetch.br-remote-glob-octopus               |   11 ++
 t/t5515/fetch.br-remote-glob-octopus_remote-glob   |   11 ++
 t/t5515/fetch.br-remote-glob_remote-glob           |   11 ++
 t/t5515/fetch.br-unconfig                          |   11 ++
 t/t5515/fetch.br-unconfig_--tags_.._.git           |    7 +
 t/t5515/fetch.br-unconfig_.._.git_one              |    2 +
 ...nfig_.._.git_one_tag_tag-one_tag_tag-three-file |    8 +
 t/t5515/fetch.br-unconfig_.._.git_one_two          |    3 +
 ...fig_.._.git_tag_tag-one-tree_tag_tag-three-file |    7 +
 ...h.br-unconfig_.._.git_tag_tag-one_tag_tag-three |    7 +
 t/t5515/fetch.br-unconfig_branches-default         |    8 +
 t/t5515/fetch.br-unconfig_branches-one             |    8 +
 t/t5515/fetch.br-unconfig_config-explicit          |   11 ++
 t/t5515/fetch.br-unconfig_config-glob              |   11 ++
 t/t5515/fetch.br-unconfig_remote-explicit          |   11 ++
 t/t5515/fetch.br-unconfig_remote-glob              |   11 ++
 t/t5515/fetch.master                               |   11 ++
 t/t5515/fetch.master_--tags_.._.git                |    7 +
 t/t5515/fetch.master_.._.git_one                   |    2 +
 ...ster_.._.git_one_tag_tag-one_tag_tag-three-file |    8 +
 t/t5515/fetch.master_.._.git_one_two               |    3 +
 ...ter_.._.git_tag_tag-one-tree_tag_tag-three-file |    7 +
 .../fetch.master_.._.git_tag_tag-one_tag_tag-three |    7 +
 t/t5515/fetch.master_branches-default              |    8 +
 t/t5515/fetch.master_branches-one                  |    8 +
 t/t5515/fetch.master_config-explicit               |   11 ++
 t/t5515/fetch.master_config-glob                   |   11 ++
 t/t5515/fetch.master_remote-explicit               |   11 ++
 t/t5515/fetch.master_remote-glob                   |   11 ++
 63 files changed, 730 insertions(+), 0 deletions(-)
 create mode 100755 t/t5515-fetch-merge-logic.sh
 create mode 100644 t/t5515/fetch.br-branches-default
 create mode 100644 t/t5515/fetch.br-branches-default-merge
 create mode 100644 t/t5515/fetch.br-branches-default-merge_branches-default
 create mode 100644 t/t5515/fetch.br-branches-default-octopus
 create mode 100644 t/t5515/fetch.br-branches-default-octopus_branches-default
 create mode 100644 t/t5515/fetch.br-branches-default_branches-default
 create mode 100644 t/t5515/fetch.br-branches-one
 create mode 100644 t/t5515/fetch.br-branches-one-merge
 create mode 100644 t/t5515/fetch.br-branches-one-merge_branches-one
 create mode 100644 t/t5515/fetch.br-branches-one-octopus
 create mode 100644 t/t5515/fetch.br-branches-one-octopus_branches-one
 create mode 100644 t/t5515/fetch.br-branches-one_branches-one
 create mode 100644 t/t5515/fetch.br-config-explicit
 create mode 100644 t/t5515/fetch.br-config-explicit-merge
 create mode 100644 t/t5515/fetch.br-config-explicit-merge_config-explicit
 create mode 100644 t/t5515/fetch.br-config-explicit-octopus
 create mode 100644 t/t5515/fetch.br-config-explicit-octopus_config-explicit
 create mode 100644 t/t5515/fetch.br-config-explicit_config-explicit
 create mode 100644 t/t5515/fetch.br-config-glob
 create mode 100644 t/t5515/fetch.br-config-glob-merge
 create mode 100644 t/t5515/fetch.br-config-glob-merge_config-glob
 create mode 100644 t/t5515/fetch.br-config-glob-octopus
 create mode 100644 t/t5515/fetch.br-config-glob-octopus_config-glob
 create mode 100644 t/t5515/fetch.br-config-glob_config-glob
 create mode 100644 t/t5515/fetch.br-remote-explicit
 create mode 100644 t/t5515/fetch.br-remote-explicit-merge
 create mode 100644 t/t5515/fetch.br-remote-explicit-merge_remote-explicit
 create mode 100644 t/t5515/fetch.br-remote-explicit-octopus
 create mode 100644 t/t5515/fetch.br-remote-explicit-octopus_remote-explicit
 create mode 100644 t/t5515/fetch.br-remote-explicit_remote-explicit
 create mode 100644 t/t5515/fetch.br-remote-glob
 create mode 100644 t/t5515/fetch.br-remote-glob-merge
 create mode 100644 t/t5515/fetch.br-remote-glob-merge_remote-glob
 create mode 100644 t/t5515/fetch.br-remote-glob-octopus
 create mode 100644 t/t5515/fetch.br-remote-glob-octopus_remote-glob
 create mode 100644 t/t5515/fetch.br-remote-glob_remote-glob
 create mode 100644 t/t5515/fetch.br-unconfig
 create mode 100644 t/t5515/fetch.br-unconfig_--tags_.._.git
 create mode 100644 t/t5515/fetch.br-unconfig_.._.git_one
 create mode 100644 t/t5515/fetch.br-unconfig_.._.git_one_tag_tag-one_tag_tag-three-file
 create mode 100644 t/t5515/fetch.br-unconfig_.._.git_one_two
 create mode 100644 t/t5515/fetch.br-unconfig_.._.git_tag_tag-one-tree_tag_tag-three-file
 create mode 100644 t/t5515/fetch.br-unconfig_.._.git_tag_tag-one_tag_tag-three
 create mode 100644 t/t5515/fetch.br-unconfig_branches-default
 create mode 100644 t/t5515/fetch.br-unconfig_branches-one
 create mode 100644 t/t5515/fetch.br-unconfig_config-explicit
 create mode 100644 t/t5515/fetch.br-unconfig_config-glob
 create mode 100644 t/t5515/fetch.br-unconfig_remote-explicit
 create mode 100644 t/t5515/fetch.br-unconfig_remote-glob
 create mode 100644 t/t5515/fetch.master
 create mode 100644 t/t5515/fetch.master_--tags_.._.git
 create mode 100644 t/t5515/fetch.master_.._.git_one
 create mode 100644 t/t5515/fetch.master_.._.git_one_tag_tag-one_tag_tag-three-file
 create mode 100644 t/t5515/fetch.master_.._.git_one_two
 create mode 100644 t/t5515/fetch.master_.._.git_tag_tag-one-tree_tag_tag-three-file
 create mode 100644 t/t5515/fetch.master_.._.git_tag_tag-one_tag_tag-three
 create mode 100644 t/t5515/fetch.master_branches-default
 create mode 100644 t/t5515/fetch.master_branches-one
 create mode 100644 t/t5515/fetch.master_config-explicit
 create mode 100644 t/t5515/fetch.master_config-glob
 create mode 100644 t/t5515/fetch.master_remote-explicit
 create mode 100644 t/t5515/fetch.master_remote-glob

t/t5515-fetch-merge-logic.sh new file +160 -0

new file mode 100755
index 0000000..128f588
@@ -0,0 +1,160 @@
+#!/bin/sh
+#
+# Copyright (c) 2007 Santi Béjar, based on t4013 by Junio C Hamano
+#
+#
+
+test_description='Merge logic in fetch'
+
+. ./test-lib.sh
+
+LF='
+'
+
+test_expect_success setup '
+	GIT_AUTHOR_DATE="2006-06-26 00:00:00 +0000" &&
+	GIT_COMMITTER_DATE="2006-06-26 00:00:00 +0000" &&
+	export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
+
+	echo >file original &&
+	git add file &&
+	git commit -a -m One &&
+	git tag tag-one &&
+	git tag tag-one-tree HEAD^{tree} &&
+	git branch one &&
+
+	echo two >> file &&
+	git commit -a -m Two &&
+	git tag -a -m "Tag Two" tag-two &&
+	git branch two &&
+
+	echo three >> file &&
+	git commit -a -m Three &&
+	git tag -a -m "Tag Three" tag-three &&
+	git tag -a -m "Tag Three file" tag-three-file HEAD^{tree}:file &&
+	git branch three &&
+
+	echo master >> file &&
+	git commit -a -m Master
+	git tag -a -m "Tag Master" tag-master &&
+
+	git checkout three
+
+	git clone . cloned &&
+	cd cloned &&
+
+	git config remote.config-explicit.url ../.git/ &&
+	git config remote.config-explicit.fetch refs/heads/master:remotes/rem/master &&
+	git config --add remote.config-explicit.fetch refs/heads/one:remotes/rem/one &&
+	git config --add remote.config-explicit.fetch two:remotes/rem/two &&
+	git config --add remote.config-explicit.fetch refs/heads/three:remotes/rem/three &&
+	remotes="config-explicit" &&
+
+	git config remote.config-glob.url ../.git/ &&
+	git config remote.config-glob.fetch refs/heads/*:refs/remotes/rem/* &&
+	remotes="$remotes config-glob" &&
+
+	mkdir -p .git/remotes &&
+	{
+		echo "URL: ../.git/"
+		echo "Pull: refs/heads/master:remotes/rem/master"
+		echo "Pull: refs/heads/one:remotes/rem/one"
+		echo "Pull: two:remotes/rem/two"
+		echo "Pull: refs/heads/three:remotes/rem/three"
+	} >.git/remotes/remote-explicit &&
+	remotes="$remotes remote-explicit" &&
+
+	{
+		echo "URL: ../.git/"
+		echo "Pull: refs/heads/*:refs/remotes/rem/*"
+	} >.git/remotes/remote-glob &&
+	remotes="$remotes remote-glob" &&
+
+	mkdir -p .git/branches &&
+	echo "../.git" > .git/branches/branches-default &&
+	remotes="$remotes branches-default" &&
+
+	echo "../.git#one" > .git/branches/branches-one &&
+	remotes="$remotes branches-one" &&
+
+	for remote in $remotes ; do
+		git config branch.br-$remote.remote $remote &&
+		git config branch.br-$remote-merge.remote $remote &&
+		git config branch.br-$remote-merge.merge refs/heads/three &&
+		git config branch.br-$remote-octopus.remote $remote &&
+		git config branch.br-$remote-octopus.merge refs/heads/one &&
+		git config --add branch.br-$remote-octopus.merge two &&
+		git config --add branch.br-$remote-octopus.merge remotes/rem/three
+	done
+'
+
+# Merge logic depends on branch properties and Pull: or .fetch lines
+for remote in $remotes ; do
+    for branch in "" "-merge" "-octopus" ; do
+cat <<EOF
+br-$remote$branch
+br-$remote$branch $remote
+EOF
+    done
+done > tests
+
+# Merge logic does not depend on branch properties,
+# but does depend on Pull: or fetch lines.
+# Use two branches completely unrelated from the arguments,
+# the clone default and one without branch properties
+for branch in master br-unconfig ; do
+    echo $branch
+    for remote in $remotes ; do
+	echo $branch $remote
+    done
+done >> tests
+
+# Merge logic does not depend on branch properties
+# neither in the Pull: or .fetch config
+for branch in master br-unconfig ; do
+    cat <<EOF
+$branch ../.git one
+$branch ../.git one two
+$branch --tags ../.git
+$branch ../.git tag tag-one tag tag-three
+$branch ../.git tag tag-one-tree tag tag-three-file
+$branch ../.git one tag tag-one tag tag-three-file
+EOF
+done >> tests
+
+while read cmd
+do
+	case "$cmd" in
+	'' | '#'*) continue ;;
+	esac
+	test=`echo "$cmd" | sed -e 's|[/ ][/ ]*|_|g'`
+	cnt=`expr $test_count + 1`
+	pfx=`printf "%04d" $cnt`
+	expect="../../t5515/fetch.$test"
+	actual="$pfx-fetch.$test"
+
+	test_expect_success "$cmd" '
+		{
+			echo "# $cmd"
+			set x $cmd; shift
+			git symbolic-ref HEAD refs/heads/$1 ; shift
+			rm -f .git/FETCH_HEAD
+			rm -f .git/refs/heads/*
+			rm -f .git/refs/remotes/rem/*
+			rm -f .git/refs/tags/*
+			git fetch "$@" >/dev/null
+			cut -f -2 .git/FETCH_HEAD
+		} >"$actual" &&
+		if test -f "$expect"
+		then
+			diff -u "$expect" "$actual" &&
+			rm -f "$actual"
+		else
+			# this is to help developing new tests.
+			cp "$actual" "$expect"
+			false
+		fi
+	'
+done < tests
+
+test_done

t/t5515/fetch.br-branches-default new file +8 -0

new file mode 100644
index 0000000..5d07051
@@ -0,0 +1,8 @@
+# br-branches-default
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge
+22feea448b023a2d864ef94b013735af34d238ba	not-for-merge
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge
+0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge

t/t5515/fetch.br-branches-default-merge new file +8 -0

new file mode 100644
index 0000000..85e2726
@@ -0,0 +1,8 @@
+# br-branches-default-merge
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge
+22feea448b023a2d864ef94b013735af34d238ba	not-for-merge
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge
+0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge

t/t5515/fetch.br-branches-default-merge_branches-default new file +8 -0

new file mode 100644
index 0000000..4663565
@@ -0,0 +1,8 @@
+# br-branches-default-merge branches-default
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge
+22feea448b023a2d864ef94b013735af34d238ba	not-for-merge
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge
+0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge

t/t5515/fetch.br-branches-default-octopus new file +8 -0

new file mode 100644
index 0000000..004c4bc
@@ -0,0 +1,8 @@
+# br-branches-default-octopus
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge
+22feea448b023a2d864ef94b013735af34d238ba	not-for-merge
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge
+0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge

t/t5515/fetch.br-branches-default-octopus_branches-default new file +8 -0

new file mode 100644
index 0000000..8ac0e4c
@@ -0,0 +1,8 @@
+# br-branches-default-octopus branches-default
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge
+22feea448b023a2d864ef94b013735af34d238ba	not-for-merge
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge
+0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge

t/t5515/fetch.br-branches-default_branches-default new file +8 -0

new file mode 100644
index 0000000..f293358
@@ -0,0 +1,8 @@
+# br-branches-default branches-default
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge
+22feea448b023a2d864ef94b013735af34d238ba	not-for-merge
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge
+0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge

t/t5515/fetch.br-branches-one new file +8 -0

new file mode 100644
index 0000000..16c0a31
@@ -0,0 +1,8 @@
+# br-branches-one
+8e32a6d901327a23ef831511badce7bf3bf46689	
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge
+22feea448b023a2d864ef94b013735af34d238ba	not-for-merge
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge
+0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge

t/t5515/fetch.br-branches-one-merge new file +8 -0

new file mode 100644
index 0000000..f9dbbaa
@@ -0,0 +1,8 @@
+# br-branches-one-merge
+8e32a6d901327a23ef831511badce7bf3bf46689	
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge
+22feea448b023a2d864ef94b013735af34d238ba	not-for-merge
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge
+0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge

t/t5515/fetch.br-branches-one-merge_branches-one new file +8 -0

new file mode 100644
index 0000000..b450dde
@@ -0,0 +1,8 @@
+# br-branches-one-merge branches-one
+8e32a6d901327a23ef831511badce7bf3bf46689	
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge
+22feea448b023a2d864ef94b013735af34d238ba	not-for-merge
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge
+0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge

t/t5515/fetch.br-branches-one-octopus new file +8 -0

new file mode 100644
index 0000000..ef91ee3
@@ -0,0 +1,8 @@
+# br-branches-one-octopus
+8e32a6d901327a23ef831511badce7bf3bf46689	
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge
+22feea448b023a2d864ef94b013735af34d238ba	not-for-merge
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge
+0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge

t/t5515/fetch.br-branches-one-octopus_branches-one new file +8 -0

new file mode 100644
index 0000000..f2fdde4
@@ -0,0 +1,8 @@
+# br-branches-one-octopus branches-one
+8e32a6d901327a23ef831511badce7bf3bf46689	
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge
+22feea448b023a2d864ef94b013735af34d238ba	not-for-merge
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge
+0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge

t/t5515/fetch.br-branches-one_branches-one new file +8 -0

new file mode 100644
index 0000000..407ec08
@@ -0,0 +1,8 @@
+# br-branches-one branches-one
+8e32a6d901327a23ef831511badce7bf3bf46689	
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge
+22feea448b023a2d864ef94b013735af34d238ba	not-for-merge
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge
+0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge

t/t5515/fetch.br-config-explicit new file +11 -0

new file mode 100644
index 0000000..7101188
@@ -0,0 +1,11 @@
+# br-config-explicit
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge
+22feea448b023a2d864ef94b013735af34d238ba	not-for-merge
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge
+0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge

t/t5515/fetch.br-config-explicit-merge new file +11 -0

new file mode 100644
index 0000000..cb1e4cb
@@ -0,0 +1,11 @@
+# br-config-explicit-merge
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge
+22feea448b023a2d864ef94b013735af34d238ba	not-for-merge
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge
+0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge

t/t5515/fetch.br-config-explicit-merge_config-explicit new file +11 -0

new file mode 100644
index 0000000..640f283
@@ -0,0 +1,11 @@
+# br-config-explicit-merge config-explicit
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge
+22feea448b023a2d864ef94b013735af34d238ba	not-for-merge
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge
+0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge

t/t5515/fetch.br-config-explicit-octopus new file +11 -0

new file mode 100644
index 0000000..ea9f165
@@ -0,0 +1,11 @@
+# br-config-explicit-octopus
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge
+8e32a6d901327a23ef831511badce7bf3bf46689	
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge
+22feea448b023a2d864ef94b013735af34d238ba	not-for-merge
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge
+0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge

t/t5515/fetch.br-config-explicit-octopus_config-explicit new file +11 -0

new file mode 100644
index 0000000..29fa5c1
@@ -0,0 +1,11 @@
+# br-config-explicit-octopus config-explicit
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge
+8e32a6d901327a23ef831511badce7bf3bf46689	
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge
+22feea448b023a2d864ef94b013735af34d238ba	not-for-merge
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge
+0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge

t/t5515/fetch.br-config-explicit_config-explicit new file +11 -0

new file mode 100644
index 0000000..ee7e0a6
@@ -0,0 +1,11 @@
+# br-config-explicit config-explicit
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge
+22feea448b023a2d864ef94b013735af34d238ba	not-for-merge
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge
+0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge

t/t5515/fetch.br-config-glob new file +11 -0

new file mode 100644
index 0000000..dcc9b65
@@ -0,0 +1,11 @@
+# br-config-glob
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge
+22feea448b023a2d864ef94b013735af34d238ba	not-for-merge
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge
+0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge

t/t5515/fetch.br-config-glob-merge new file +11 -0

new file mode 100644
index 0000000..ead4eb0
@@ -0,0 +1,11 @@
+# br-config-glob-merge
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge
+22feea448b023a2d864ef94b013735af34d238ba	not-for-merge
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge
+0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge

t/t5515/fetch.br-config-glob-merge_config-glob new file +11 -0

new file mode 100644
index 0000000..5db6e7b
@@ -0,0 +1,11 @@
+# br-config-glob-merge config-glob
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge
+22feea448b023a2d864ef94b013735af34d238ba	not-for-merge
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge
+0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge

t/t5515/fetch.br-config-glob-octopus new file +11 -0

new file mode 100644
index 0000000..9d99052
@@ -0,0 +1,11 @@
+# br-config-glob-octopus
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge
+8e32a6d901327a23ef831511badce7bf3bf46689	
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge
+22feea448b023a2d864ef94b013735af34d238ba	not-for-merge
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge
+0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge

t/t5515/fetch.br-config-glob-octopus_config-glob new file +11 -0

new file mode 100644
index 0000000..dfccb15
@@ -0,0 +1,11 @@
+# br-config-glob-octopus config-glob
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge
+8e32a6d901327a23ef831511badce7bf3bf46689	
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge
+22feea448b023a2d864ef94b013735af34d238ba	not-for-merge
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge
+0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge

t/t5515/fetch.br-config-glob_config-glob new file +11 -0

new file mode 100644
index 0000000..5c2fe01
@@ -0,0 +1,11 @@
+# br-config-glob config-glob
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge
+22feea448b023a2d864ef94b013735af34d238ba	not-for-merge
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge
+0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge

t/t5515/fetch.br-remote-explicit new file +11 -0

new file mode 100644
index 0000000..b874d69
@@ -0,0 +1,11 @@
+# br-remote-explicit
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge
+22feea448b023a2d864ef94b013735af34d238ba	not-for-merge
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge
+0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge

t/t5515/fetch.br-remote-explicit-merge new file +11 -0

new file mode 100644
index 0000000..0cd8921
@@ -0,0 +1,11 @@
+# br-remote-explicit-merge
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge
+22feea448b023a2d864ef94b013735af34d238ba	not-for-merge
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge
+0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge

t/t5515/fetch.br-remote-explicit-merge_remote-explicit new file +11 -0

new file mode 100644
index 0000000..4440063
@@ -0,0 +1,11 @@
+# br-remote-explicit-merge remote-explicit
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge
+22feea448b023a2d864ef94b013735af34d238ba	not-for-merge
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge
+0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge

t/t5515/fetch.br-remote-explicit-octopus new file +11 -0

new file mode 100644
index 0000000..357dad5
@@ -0,0 +1,11 @@
+# br-remote-explicit-octopus
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge
+8e32a6d901327a23ef831511badce7bf3bf46689	
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge
+22feea448b023a2d864ef94b013735af34d238ba	not-for-merge
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge
+0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge

t/t5515/fetch.br-remote-explicit-octopus_remote-explicit new file +11 -0

new file mode 100644
index 0000000..0da1471
@@ -0,0 +1,11 @@
+# br-remote-explicit-octopus remote-explicit
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge
+8e32a6d901327a23ef831511badce7bf3bf46689	
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge
+22feea448b023a2d864ef94b013735af34d238ba	not-for-merge
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge
+0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge

t/t5515/fetch.br-remote-explicit_remote-explicit new file +11 -0

new file mode 100644
index 0000000..af7b7cc
@@ -0,0 +1,11 @@
+# br-remote-explicit remote-explicit
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge
+22feea448b023a2d864ef94b013735af34d238ba	not-for-merge
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge
+0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge

t/t5515/fetch.br-remote-glob new file +11 -0

new file mode 100644
index 0000000..bfff8ad
@@ -0,0 +1,11 @@
+# br-remote-glob
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge
+22feea448b023a2d864ef94b013735af34d238ba	not-for-merge
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge
+0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge

t/t5515/fetch.br-remote-glob-merge new file +11 -0

new file mode 100644
index 0000000..58c50ef
@@ -0,0 +1,11 @@
+# br-remote-glob-merge
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge
+22feea448b023a2d864ef94b013735af34d238ba	not-for-merge
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge
+0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge

t/t5515/fetch.br-remote-glob-merge_remote-glob new file +11 -0

new file mode 100644
index 0000000..dbfbf66
@@ -0,0 +1,11 @@
+# br-remote-glob-merge remote-glob
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge
+22feea448b023a2d864ef94b013735af34d238ba	not-for-merge
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge
+0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge

t/t5515/fetch.br-remote-glob-octopus new file +11 -0

new file mode 100644
index 0000000..0b46c8e
@@ -0,0 +1,11 @@
+# br-remote-glob-octopus
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge
+8e32a6d901327a23ef831511badce7bf3bf46689	
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge
+22feea448b023a2d864ef94b013735af34d238ba	not-for-merge
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge
+0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge

t/t5515/fetch.br-remote-glob-octopus_remote-glob new file +11 -0

new file mode 100644
index 0000000..b9e5250
@@ -0,0 +1,11 @@
+# br-remote-glob-octopus remote-glob
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge
+8e32a6d901327a23ef831511badce7bf3bf46689	
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge
+22feea448b023a2d864ef94b013735af34d238ba	not-for-merge
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge
+0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge

t/t5515/fetch.br-remote-glob_remote-glob new file +11 -0

new file mode 100644
index 0000000..dbe5d23
@@ -0,0 +1,11 @@
+# br-remote-glob remote-glob
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge
+22feea448b023a2d864ef94b013735af34d238ba	not-for-merge
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge
+0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge

t/t5515/fetch.br-unconfig new file +11 -0

new file mode 100644
index 0000000..ac446c6
@@ -0,0 +1,11 @@
+# br-unconfig
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge
+22feea448b023a2d864ef94b013735af34d238ba	not-for-merge
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge
+0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge

t/t5515/fetch.br-unconfig_--tags_.._.git new file +7 -0

new file mode 100644
index 0000000..4ab7d67
@@ -0,0 +1,7 @@
+# br-unconfig --tags ../.git
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge
+22feea448b023a2d864ef94b013735af34d238ba	not-for-merge
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge
+0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge

t/t5515/fetch.br-unconfig_.._.git_one new file +2 -0

new file mode 100644
index 0000000..13d28c6
@@ -0,0 +1,2 @@
+# br-unconfig ../.git one
+8e32a6d901327a23ef831511badce7bf3bf46689

t/t5515/fetch.br-unconfig_.._.git_one_tag_tag-one_tag_tag-three-file new file +8 -0

new file mode 100644
index 0000000..b7e045a
@@ -0,0 +1,8 @@
+# br-unconfig ../.git one tag tag-one tag tag-three-file
+8e32a6d901327a23ef831511badce7bf3bf46689	
+8e32a6d901327a23ef831511badce7bf3bf46689	
+0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge
+22feea448b023a2d864ef94b013735af34d238ba	not-for-merge
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge

t/t5515/fetch.br-unconfig_.._.git_one_two new file +3 -0

new file mode 100644
index 0000000..c67da8d
@@ -0,0 +1,3 @@
+# br-unconfig ../.git one two
+8e32a6d901327a23ef831511badce7bf3bf46689	
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8

t/t5515/fetch.br-unconfig_.._.git_tag_tag-one-tree_tag_tag-three-file new file +7 -0

new file mode 100644
index 0000000..d2d979b
@@ -0,0 +1,7 @@
+# br-unconfig ../.git tag tag-one-tree tag tag-three-file
+22feea448b023a2d864ef94b013735af34d238ba	not-for-merge
+0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge

t/t5515/fetch.br-unconfig_.._.git_tag_tag-one_tag_tag-three new file +7 -0

new file mode 100644
index 0000000..2f2356a
@@ -0,0 +1,7 @@
+# br-unconfig ../.git tag tag-one tag tag-three
+8e32a6d901327a23ef831511badce7bf3bf46689	
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge
+22feea448b023a2d864ef94b013735af34d238ba	not-for-merge
+0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge

t/t5515/fetch.br-unconfig_branches-default new file +8 -0

new file mode 100644
index 0000000..d7367f1
@@ -0,0 +1,8 @@
+# br-unconfig branches-default
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge
+22feea448b023a2d864ef94b013735af34d238ba	not-for-merge
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge
+0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge

t/t5515/fetch.br-unconfig_branches-one new file +8 -0

new file mode 100644
index 0000000..47fb837
@@ -0,0 +1,8 @@
+# br-unconfig branches-one
+8e32a6d901327a23ef831511badce7bf3bf46689	
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge
+22feea448b023a2d864ef94b013735af34d238ba	not-for-merge
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge
+0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge

t/t5515/fetch.br-unconfig_config-explicit new file +11 -0

new file mode 100644
index 0000000..9acccbf
@@ -0,0 +1,11 @@
+# br-unconfig config-explicit
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge
+22feea448b023a2d864ef94b013735af34d238ba	not-for-merge
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge
+0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge

t/t5515/fetch.br-unconfig_config-glob new file +11 -0

new file mode 100644
index 0000000..3e4c479
@@ -0,0 +1,11 @@
+# br-unconfig config-glob
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge
+22feea448b023a2d864ef94b013735af34d238ba	not-for-merge
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge
+0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge

t/t5515/fetch.br-unconfig_remote-explicit new file +11 -0

new file mode 100644
index 0000000..ab72b04
@@ -0,0 +1,11 @@
+# br-unconfig remote-explicit
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge
+22feea448b023a2d864ef94b013735af34d238ba	not-for-merge
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge
+0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge

t/t5515/fetch.br-unconfig_remote-glob new file +11 -0

new file mode 100644
index 0000000..08c4c87
@@ -0,0 +1,11 @@
+# br-unconfig remote-glob
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge
+22feea448b023a2d864ef94b013735af34d238ba	not-for-merge
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge
+0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge

t/t5515/fetch.master new file +11 -0

new file mode 100644
index 0000000..ae2aedf
@@ -0,0 +1,11 @@
+# master
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge
+22feea448b023a2d864ef94b013735af34d238ba	not-for-merge
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge
+0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge

t/t5515/fetch.master_--tags_.._.git new file +7 -0

new file mode 100644
index 0000000..c297e65
@@ -0,0 +1,7 @@
+# master --tags ../.git
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge
+22feea448b023a2d864ef94b013735af34d238ba	not-for-merge
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge
+0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge

t/t5515/fetch.master_.._.git_one new file +2 -0

new file mode 100644
index 0000000..090924e
@@ -0,0 +1,2 @@
+# master ../.git one
+8e32a6d901327a23ef831511badce7bf3bf46689

t/t5515/fetch.master_.._.git_one_tag_tag-one_tag_tag-three-file new file +8 -0

new file mode 100644
index 0000000..bdbde66
@@ -0,0 +1,8 @@
+# master ../.git one tag tag-one tag tag-three-file
+8e32a6d901327a23ef831511badce7bf3bf46689	
+8e32a6d901327a23ef831511badce7bf3bf46689	
+0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge
+22feea448b023a2d864ef94b013735af34d238ba	not-for-merge
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge

t/t5515/fetch.master_.._.git_one_two new file +3 -0

new file mode 100644
index 0000000..81b85aa
@@ -0,0 +1,3 @@
+# master ../.git one two
+8e32a6d901327a23ef831511badce7bf3bf46689	
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8

t/t5515/fetch.master_.._.git_tag_tag-one-tree_tag_tag-three-file new file +7 -0

new file mode 100644
index 0000000..310516b
@@ -0,0 +1,7 @@
+# master ../.git tag tag-one-tree tag tag-three-file
+22feea448b023a2d864ef94b013735af34d238ba	not-for-merge
+0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge

t/t5515/fetch.master_.._.git_tag_tag-one_tag_tag-three new file +7 -0

new file mode 100644
index 0000000..60dbcff
@@ -0,0 +1,7 @@
+# master ../.git tag tag-one tag tag-three
+8e32a6d901327a23ef831511badce7bf3bf46689	
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge
+22feea448b023a2d864ef94b013735af34d238ba	not-for-merge
+0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge

t/t5515/fetch.master_branches-default new file +8 -0

new file mode 100644
index 0000000..937d90c
@@ -0,0 +1,8 @@
+# master branches-default
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge
+22feea448b023a2d864ef94b013735af34d238ba	not-for-merge
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge
+0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge

t/t5515/fetch.master_branches-one new file +8 -0

new file mode 100644
index 0000000..30907fb
@@ -0,0 +1,8 @@
+# master branches-one
+8e32a6d901327a23ef831511badce7bf3bf46689	
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge
+22feea448b023a2d864ef94b013735af34d238ba	not-for-merge
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge
+0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge

t/t5515/fetch.master_config-explicit new file +11 -0

new file mode 100644
index 0000000..3e77f93
@@ -0,0 +1,11 @@
+# master config-explicit
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge
+22feea448b023a2d864ef94b013735af34d238ba	not-for-merge
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge
+0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge

t/t5515/fetch.master_config-glob new file +11 -0

new file mode 100644
index 0000000..c0bf9d0
@@ -0,0 +1,11 @@
+# master config-glob
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge
+22feea448b023a2d864ef94b013735af34d238ba	not-for-merge
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge
+0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge

t/t5515/fetch.master_remote-explicit new file +11 -0

new file mode 100644
index 0000000..2f9d4d3
@@ -0,0 +1,11 @@
+# master remote-explicit
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge
+22feea448b023a2d864ef94b013735af34d238ba	not-for-merge
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge
+0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge

t/t5515/fetch.master_remote-glob new file +11 -0

new file mode 100644
index 0000000..7a52126
@@ -0,0 +1,11 @@
+# master remote-glob
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge
+22feea448b023a2d864ef94b013735af34d238ba	not-for-merge
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge
+0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge

Signature · 1 line

1.5.0.2.879.gc531d4-dirty

Junio C Hamano

2016-06-15 22:42 UTC #1 lore raw

Quoted 7 lines · Santi Béjar

Signed-off-by Santi Béjar <[email protected]>
---
Hi *,
it is a much reduced version (63 instead of 400 tests) but contains
also tests for the fetched tags (missing anything else?). I think it is suitable to be included.

Thanks.

One thing I found lacking from the last round was that the test stripped the origin information later used by git-fmt-merge-msg (which made the test not very helpful when I tried to use it while working on the partial rewrite of git-fetch you see in the 'next' branch). I haven't checked your patch this round yet, but it would be nice to check for that to catch regressions.

Santi Béjar

author

2016-06-15 22:42 UTC #2 lore raw

Quoted 10 lines · Junio C Hamano

Quoted 7 lines · Santi Béjar
Signed-off-by Santi Béjar <[email protected]>
---
Hi *,
it is a much reduced version (63 instead of 400 tests) but contains
also tests for the fetched tags (missing anything else?). I think it is suitable to be included.

Quoted 8 lines

Thanks.
One thing I found lacking from the last round was that the test stripped the origin information later used by git-fmt-merge-msg (which made the test not very helpful when I tried to use it while working on the partial rewrite of git-fetch you see in the 'next' branch). I haven't checked your patch this round yet, but it would be nice to check for that to catch regressions.

It is stripped, I'll send another patch with the whole .git/FETCH_HEAD content.

Santi

Santi Béjar

author

2016-06-15 22:42 UTC #3 lore raw

In reply to Santi Béjar

Hi *,

this version does not remove the "note" feed to git-fmt-merge-msg. I've also added two &&.

Santi

P.D.: When sended this way the From: must be quoted or in UTF-8?

-- >8 --
From: =?utf-8?q?Santi_B=C3=A9jar?= <[email protected]>
Date: Sun, 4 Mar 2007 20:38:54 +0100
Subject: [PATCH] t/t5515-fetch-merge-logic.sh: Added tests for the merge login in git-fetch

Signed-off-by Santi Béjar <[email protected]>

---
 t/t5515-fetch-merge-logic.sh                       |  161 ++++++++++++++++++++
 t/t5515/fetch.br-branches-default                  |    8 +
 t/t5515/fetch.br-branches-default-merge            |    8 +
 ...etch.br-branches-default-merge_branches-default |    8 +
 t/t5515/fetch.br-branches-default-octopus          |    8 +
 ...ch.br-branches-default-octopus_branches-default |    8 +
 t/t5515/fetch.br-branches-default_branches-default |    8 +
 t/t5515/fetch.br-branches-one                      |    8 +
 t/t5515/fetch.br-branches-one-merge                |    8 +
 t/t5515/fetch.br-branches-one-merge_branches-one   |    8 +
 t/t5515/fetch.br-branches-one-octopus              |    8 +
 t/t5515/fetch.br-branches-one-octopus_branches-one |    8 +
 t/t5515/fetch.br-branches-one_branches-one         |    8 +
 t/t5515/fetch.br-config-explicit                   |   11 ++
 t/t5515/fetch.br-config-explicit-merge             |   11 ++
 .../fetch.br-config-explicit-merge_config-explicit |   11 ++
 t/t5515/fetch.br-config-explicit-octopus           |   11 ++
 ...etch.br-config-explicit-octopus_config-explicit |   11 ++
 t/t5515/fetch.br-config-explicit_config-explicit   |   11 ++
 t/t5515/fetch.br-config-glob                       |   11 ++
 t/t5515/fetch.br-config-glob-merge                 |   11 ++
 t/t5515/fetch.br-config-glob-merge_config-glob     |   11 ++
 t/t5515/fetch.br-config-glob-octopus               |   11 ++
 t/t5515/fetch.br-config-glob-octopus_config-glob   |   11 ++
 t/t5515/fetch.br-config-glob_config-glob           |   11 ++
 t/t5515/fetch.br-remote-explicit                   |   11 ++
 t/t5515/fetch.br-remote-explicit-merge             |   11 ++
 .../fetch.br-remote-explicit-merge_remote-explicit |   11 ++
 t/t5515/fetch.br-remote-explicit-octopus           |   11 ++
 ...etch.br-remote-explicit-octopus_remote-explicit |   11 ++
 t/t5515/fetch.br-remote-explicit_remote-explicit   |   11 ++
 t/t5515/fetch.br-remote-glob                       |   11 ++
 t/t5515/fetch.br-remote-glob-merge                 |   11 ++
 t/t5515/fetch.br-remote-glob-merge_remote-glob     |   11 ++
 t/t5515/fetch.br-remote-glob-octopus               |   11 ++
 t/t5515/fetch.br-remote-glob-octopus_remote-glob   |   11 ++
 t/t5515/fetch.br-remote-glob_remote-glob           |   11 ++
 t/t5515/fetch.br-unconfig                          |   11 ++
 t/t5515/fetch.br-unconfig_--tags_.._.git           |    7 +
 t/t5515/fetch.br-unconfig_.._.git_one              |    2 +
 ...nfig_.._.git_one_tag_tag-one_tag_tag-three-file |    8 +
 t/t5515/fetch.br-unconfig_.._.git_one_two          |    3 +
 ...fig_.._.git_tag_tag-one-tree_tag_tag-three-file |    7 +
 ...h.br-unconfig_.._.git_tag_tag-one_tag_tag-three |    7 +
 t/t5515/fetch.br-unconfig_branches-default         |    8 +
 t/t5515/fetch.br-unconfig_branches-one             |    8 +
 t/t5515/fetch.br-unconfig_config-explicit          |   11 ++
 t/t5515/fetch.br-unconfig_config-glob              |   11 ++
 t/t5515/fetch.br-unconfig_remote-explicit          |   11 ++
 t/t5515/fetch.br-unconfig_remote-glob              |   11 ++
 t/t5515/fetch.master                               |   11 ++
 t/t5515/fetch.master_--tags_.._.git                |    7 +
 t/t5515/fetch.master_.._.git_one                   |    2 +
 ...ster_.._.git_one_tag_tag-one_tag_tag-three-file |    8 +
 t/t5515/fetch.master_.._.git_one_two               |    3 +
 ...ter_.._.git_tag_tag-one-tree_tag_tag-three-file |    7 +
 .../fetch.master_.._.git_tag_tag-one_tag_tag-three |    7 +
 t/t5515/fetch.master_branches-default              |    8 +
 t/t5515/fetch.master_branches-one                  |    8 +
 t/t5515/fetch.master_config-explicit               |   11 ++
 t/t5515/fetch.master_config-glob                   |   11 ++
 t/t5515/fetch.master_remote-explicit               |   11 ++
 t/t5515/fetch.master_remote-glob                   |   11 ++
 63 files changed, 731 insertions(+), 0 deletions(-)
 create mode 100755 t/t5515-fetch-merge-logic.sh
 create mode 100644 t/t5515/fetch.br-branches-default
 create mode 100644 t/t5515/fetch.br-branches-default-merge
 create mode 100644 t/t5515/fetch.br-branches-default-merge_branches-default
 create mode 100644 t/t5515/fetch.br-branches-default-octopus
 create mode 100644 t/t5515/fetch.br-branches-default-octopus_branches-default
 create mode 100644 t/t5515/fetch.br-branches-default_branches-default
 create mode 100644 t/t5515/fetch.br-branches-one
 create mode 100644 t/t5515/fetch.br-branches-one-merge
 create mode 100644 t/t5515/fetch.br-branches-one-merge_branches-one
 create mode 100644 t/t5515/fetch.br-branches-one-octopus
 create mode 100644 t/t5515/fetch.br-branches-one-octopus_branches-one
 create mode 100644 t/t5515/fetch.br-branches-one_branches-one
 create mode 100644 t/t5515/fetch.br-config-explicit
 create mode 100644 t/t5515/fetch.br-config-explicit-merge
 create mode 100644 t/t5515/fetch.br-config-explicit-merge_config-explicit
 create mode 100644 t/t5515/fetch.br-config-explicit-octopus
 create mode 100644 t/t5515/fetch.br-config-explicit-octopus_config-explicit
 create mode 100644 t/t5515/fetch.br-config-explicit_config-explicit
 create mode 100644 t/t5515/fetch.br-config-glob
 create mode 100644 t/t5515/fetch.br-config-glob-merge
 create mode 100644 t/t5515/fetch.br-config-glob-merge_config-glob
 create mode 100644 t/t5515/fetch.br-config-glob-octopus
 create mode 100644 t/t5515/fetch.br-config-glob-octopus_config-glob
 create mode 100644 t/t5515/fetch.br-config-glob_config-glob
 create mode 100644 t/t5515/fetch.br-remote-explicit
 create mode 100644 t/t5515/fetch.br-remote-explicit-merge
 create mode 100644 t/t5515/fetch.br-remote-explicit-merge_remote-explicit
 create mode 100644 t/t5515/fetch.br-remote-explicit-octopus
 create mode 100644 t/t5515/fetch.br-remote-explicit-octopus_remote-explicit
 create mode 100644 t/t5515/fetch.br-remote-explicit_remote-explicit
 create mode 100644 t/t5515/fetch.br-remote-glob
 create mode 100644 t/t5515/fetch.br-remote-glob-merge
 create mode 100644 t/t5515/fetch.br-remote-glob-merge_remote-glob
 create mode 100644 t/t5515/fetch.br-remote-glob-octopus
 create mode 100644 t/t5515/fetch.br-remote-glob-octopus_remote-glob
 create mode 100644 t/t5515/fetch.br-remote-glob_remote-glob
 create mode 100644 t/t5515/fetch.br-unconfig
 create mode 100644 t/t5515/fetch.br-unconfig_--tags_.._.git
 create mode 100644 t/t5515/fetch.br-unconfig_.._.git_one
 create mode 100644 t/t5515/fetch.br-unconfig_.._.git_one_tag_tag-one_tag_tag-three-file
 create mode 100644 t/t5515/fetch.br-unconfig_.._.git_one_two
 create mode 100644 t/t5515/fetch.br-unconfig_.._.git_tag_tag-one-tree_tag_tag-three-file
 create mode 100644 t/t5515/fetch.br-unconfig_.._.git_tag_tag-one_tag_tag-three
 create mode 100644 t/t5515/fetch.br-unconfig_branches-default
 create mode 100644 t/t5515/fetch.br-unconfig_branches-one
 create mode 100644 t/t5515/fetch.br-unconfig_config-explicit
 create mode 100644 t/t5515/fetch.br-unconfig_config-glob
 create mode 100644 t/t5515/fetch.br-unconfig_remote-explicit
 create mode 100644 t/t5515/fetch.br-unconfig_remote-glob
 create mode 100644 t/t5515/fetch.master
 create mode 100644 t/t5515/fetch.master_--tags_.._.git
 create mode 100644 t/t5515/fetch.master_.._.git_one
 create mode 100644 t/t5515/fetch.master_.._.git_one_tag_tag-one_tag_tag-three-file
 create mode 100644 t/t5515/fetch.master_.._.git_one_two
 create mode 100644 t/t5515/fetch.master_.._.git_tag_tag-one-tree_tag_tag-three-file
 create mode 100644 t/t5515/fetch.master_.._.git_tag_tag-one_tag_tag-three
 create mode 100644 t/t5515/fetch.master_branches-default
 create mode 100644 t/t5515/fetch.master_branches-one
 create mode 100644 t/t5515/fetch.master_config-explicit
 create mode 100644 t/t5515/fetch.master_config-glob
 create mode 100644 t/t5515/fetch.master_remote-explicit
 create mode 100644 t/t5515/fetch.master_remote-glob

t/t5515-fetch-merge-logic.sh new file +161 -0

new file mode 100755
index 0000000..765c83f
@@ -0,0 +1,161 @@
+#!/bin/sh
+#
+# Copyright (c) 2007 Santi Béjar, based on t4013 by Junio C Hamano
+#
+#
+
+test_description='Merge logic in fetch'
+
+. ./test-lib.sh
+
+LF='
+'
+
+test_expect_success setup '
+	GIT_AUTHOR_DATE="2006-06-26 00:00:00 +0000" &&
+	GIT_COMMITTER_DATE="2006-06-26 00:00:00 +0000" &&
+	export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
+
+	echo >file original &&
+	git add file &&
+	git commit -a -m One &&
+	git tag tag-one &&
+	git tag tag-one-tree HEAD^{tree} &&
+	git branch one &&
+
+	echo two >> file &&
+	git commit -a -m Two &&
+	git tag -a -m "Tag Two" tag-two &&
+	git branch two &&
+
+	echo three >> file &&
+	git commit -a -m Three &&
+	git tag -a -m "Tag Three" tag-three &&
+	git tag -a -m "Tag Three file" tag-three-file HEAD^{tree}:file &&
+	git branch three &&
+
+	echo master >> file &&
+	git commit -a -m Master &&
+	git tag -a -m "Tag Master" tag-master &&
+
+	git checkout three &&
+
+	git clone . cloned &&
+	cd cloned &&
+	git config remote.origin.url ../.git/ &&
+
+	git config remote.config-explicit.url ../.git/ &&
+	git config remote.config-explicit.fetch refs/heads/master:remotes/rem/master &&
+	git config --add remote.config-explicit.fetch refs/heads/one:remotes/rem/one &&
+	git config --add remote.config-explicit.fetch two:remotes/rem/two &&
+	git config --add remote.config-explicit.fetch refs/heads/three:remotes/rem/three &&
+	remotes="config-explicit" &&
+
+	git config remote.config-glob.url ../.git/ &&
+	git config remote.config-glob.fetch refs/heads/*:refs/remotes/rem/* &&
+	remotes="$remotes config-glob" &&
+
+	mkdir -p .git/remotes &&
+	{
+		echo "URL: ../.git/"
+		echo "Pull: refs/heads/master:remotes/rem/master"
+		echo "Pull: refs/heads/one:remotes/rem/one"
+		echo "Pull: two:remotes/rem/two"
+		echo "Pull: refs/heads/three:remotes/rem/three"
+	} >.git/remotes/remote-explicit &&
+	remotes="$remotes remote-explicit" &&
+
+	{
+		echo "URL: ../.git/"
+		echo "Pull: refs/heads/*:refs/remotes/rem/*"
+	} >.git/remotes/remote-glob &&
+	remotes="$remotes remote-glob" &&
+
+	mkdir -p .git/branches &&
+	echo "../.git" > .git/branches/branches-default &&
+	remotes="$remotes branches-default" &&
+
+	echo "../.git#one" > .git/branches/branches-one &&
+	remotes="$remotes branches-one" &&
+
+	for remote in $remotes ; do
+		git config branch.br-$remote.remote $remote &&
+		git config branch.br-$remote-merge.remote $remote &&
+		git config branch.br-$remote-merge.merge refs/heads/three &&
+		git config branch.br-$remote-octopus.remote $remote &&
+		git config branch.br-$remote-octopus.merge refs/heads/one &&
+		git config --add branch.br-$remote-octopus.merge two &&
+		git config --add branch.br-$remote-octopus.merge remotes/rem/three
+	done
+'
+
+# Merge logic depends on branch properties and Pull: or .fetch lines
+for remote in $remotes ; do
+    for branch in "" "-merge" "-octopus" ; do
+cat <<EOF
+br-$remote$branch
+br-$remote$branch $remote
+EOF
+    done
+done > tests
+
+# Merge logic does not depend on branch properties,
+# but does depend on Pull: or fetch lines.
+# Use two branches completely unrelated from the arguments,
+# the clone default and one without branch properties
+for branch in master br-unconfig ; do
+    echo $branch
+    for remote in $remotes ; do
+	echo $branch $remote
+    done
+done >> tests
+
+# Merge logic does not depend on branch properties
+# neither in the Pull: or .fetch config
+for branch in master br-unconfig ; do
+    cat <<EOF
+$branch ../.git one
+$branch ../.git one two
+$branch --tags ../.git
+$branch ../.git tag tag-one tag tag-three
+$branch ../.git tag tag-one-tree tag tag-three-file
+$branch ../.git one tag tag-one tag tag-three-file
+EOF
+done >> tests
+
+while read cmd
+do
+	case "$cmd" in
+	'' | '#'*) continue ;;
+	esac
+	test=`echo "$cmd" | sed -e 's|[/ ][/ ]*|_|g'`
+	cnt=`expr $test_count + 1`
+	pfx=`printf "%04d" $cnt`
+	expect="../../t5515/fetch.$test"
+	actual="$pfx-fetch.$test"
+
+	test_expect_success "$cmd" '
+		{
+			echo "# $cmd"
+			set x $cmd; shift
+			git symbolic-ref HEAD refs/heads/$1 ; shift
+			rm -f .git/FETCH_HEAD
+			rm -f .git/refs/heads/*
+			rm -f .git/refs/remotes/rem/*
+			rm -f .git/refs/tags/*
+			git fetch "$@" >/dev/null
+			cat .git/FETCH_HEAD
+		} >"$actual" &&
+		if test -f "$expect"
+		then
+			diff -u "$expect" "$actual" &&
+			rm -f "$actual"
+		else
+			# this is to help developing new tests.
+			cp "$actual" "$expect"
+			false
+		fi
+	'
+done < tests
+
+test_done

t/t5515/fetch.br-branches-default new file +8 -0

new file mode 100644
index 0000000..2e0414f
@@ -0,0 +1,8 @@
+# br-branches-default
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f		branch 'master' of ../
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge	tag 'tag-master' of ../
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	tag 'tag-one' of ../
+22feea448b023a2d864ef94b013735af34d238ba	not-for-merge	tag 'tag-one-tree' of ../
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge	tag 'tag-three' of ../
+0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge	tag 'tag-three-file' of ../
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge	tag 'tag-two' of ../

t/t5515/fetch.br-branches-default-merge new file +8 -0

new file mode 100644
index 0000000..ea65f31
@@ -0,0 +1,8 @@
+# br-branches-default-merge
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f		branch 'master' of ../
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge	tag 'tag-master' of ../
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	tag 'tag-one' of ../
+22feea448b023a2d864ef94b013735af34d238ba	not-for-merge	tag 'tag-one-tree' of ../
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge	tag 'tag-three' of ../
+0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge	tag 'tag-three-file' of ../
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge	tag 'tag-two' of ../

t/t5515/fetch.br-branches-default-merge_branches-default new file +8 -0

new file mode 100644
index 0000000..7b5fa94
@@ -0,0 +1,8 @@
+# br-branches-default-merge branches-default
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f		branch 'master' of ../
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge	tag 'tag-master' of ../
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	tag 'tag-one' of ../
+22feea448b023a2d864ef94b013735af34d238ba	not-for-merge	tag 'tag-one-tree' of ../
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge	tag 'tag-three' of ../
+0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge	tag 'tag-three-file' of ../
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge	tag 'tag-two' of ../

t/t5515/fetch.br-branches-default-octopus new file +8 -0

new file mode 100644
index 0000000..128397d
@@ -0,0 +1,8 @@
+# br-branches-default-octopus
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f		branch 'master' of ../
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge	tag 'tag-master' of ../
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	tag 'tag-one' of ../
+22feea448b023a2d864ef94b013735af34d238ba	not-for-merge	tag 'tag-one-tree' of ../
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge	tag 'tag-three' of ../
+0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge	tag 'tag-three-file' of ../
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge	tag 'tag-two' of ../

t/t5515/fetch.br-branches-default-octopus_branches-default new file +8 -0

new file mode 100644
index 0000000..4b37cd4
@@ -0,0 +1,8 @@
+# br-branches-default-octopus branches-default
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f		branch 'master' of ../
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge	tag 'tag-master' of ../
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	tag 'tag-one' of ../
+22feea448b023a2d864ef94b013735af34d238ba	not-for-merge	tag 'tag-one-tree' of ../
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge	tag 'tag-three' of ../
+0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge	tag 'tag-three-file' of ../
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge	tag 'tag-two' of ../

t/t5515/fetch.br-branches-default_branches-default new file +8 -0

new file mode 100644
index 0000000..4a2bf3c
@@ -0,0 +1,8 @@
+# br-branches-default branches-default
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f		branch 'master' of ../
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge	tag 'tag-master' of ../
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	tag 'tag-one' of ../
+22feea448b023a2d864ef94b013735af34d238ba	not-for-merge	tag 'tag-one-tree' of ../
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge	tag 'tag-three' of ../
+0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge	tag 'tag-three-file' of ../
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge	tag 'tag-two' of ../

t/t5515/fetch.br-branches-one new file +8 -0

new file mode 100644
index 0000000..12ac8d2
@@ -0,0 +1,8 @@
+# br-branches-one
+8e32a6d901327a23ef831511badce7bf3bf46689		branch 'one' of ../
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge	tag 'tag-master' of ../
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	tag 'tag-one' of ../
+22feea448b023a2d864ef94b013735af34d238ba	not-for-merge	tag 'tag-one-tree' of ../
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge	tag 'tag-three' of ../
+0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge	tag 'tag-three-file' of ../
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge	tag 'tag-two' of ../

t/t5515/fetch.br-branches-one-merge new file +8 -0

new file mode 100644
index 0000000..3a4e77e
@@ -0,0 +1,8 @@
+# br-branches-one-merge
+8e32a6d901327a23ef831511badce7bf3bf46689		branch 'one' of ../
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge	tag 'tag-master' of ../
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	tag 'tag-one' of ../
+22feea448b023a2d864ef94b013735af34d238ba	not-for-merge	tag 'tag-one-tree' of ../
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge	tag 'tag-three' of ../
+0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge	tag 'tag-three-file' of ../
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge	tag 'tag-two' of ../

t/t5515/fetch.br-branches-one-merge_branches-one new file +8 -0

new file mode 100644
index 0000000..00e04b4
@@ -0,0 +1,8 @@
+# br-branches-one-merge branches-one
+8e32a6d901327a23ef831511badce7bf3bf46689		branch 'one' of ../
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge	tag 'tag-master' of ../
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	tag 'tag-one' of ../
+22feea448b023a2d864ef94b013735af34d238ba	not-for-merge	tag 'tag-one-tree' of ../
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge	tag 'tag-three' of ../
+0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge	tag 'tag-three-file' of ../
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge	tag 'tag-two' of ../

t/t5515/fetch.br-branches-one-octopus new file +8 -0

new file mode 100644
index 0000000..53fe808
@@ -0,0 +1,8 @@
+# br-branches-one-octopus
+8e32a6d901327a23ef831511badce7bf3bf46689		branch 'one' of ../
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge	tag 'tag-master' of ../
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	tag 'tag-one' of ../
+22feea448b023a2d864ef94b013735af34d238ba	not-for-merge	tag 'tag-one-tree' of ../
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge	tag 'tag-three' of ../
+0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge	tag 'tag-three-file' of ../
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge	tag 'tag-two' of ../

t/t5515/fetch.br-branches-one-octopus_branches-one new file +8 -0

new file mode 100644
index 0000000..41b18ff
@@ -0,0 +1,8 @@
+# br-branches-one-octopus branches-one
+8e32a6d901327a23ef831511badce7bf3bf46689		branch 'one' of ../
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge	tag 'tag-master' of ../
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	tag 'tag-one' of ../
+22feea448b023a2d864ef94b013735af34d238ba	not-for-merge	tag 'tag-one-tree' of ../
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge	tag 'tag-three' of ../
+0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge	tag 'tag-three-file' of ../
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge	tag 'tag-two' of ../

t/t5515/fetch.br-branches-one_branches-one new file +8 -0

new file mode 100644
index 0000000..281fa09
@@ -0,0 +1,8 @@
+# br-branches-one branches-one
+8e32a6d901327a23ef831511badce7bf3bf46689		branch 'one' of ../
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge	tag 'tag-master' of ../
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	tag 'tag-one' of ../
+22feea448b023a2d864ef94b013735af34d238ba	not-for-merge	tag 'tag-one-tree' of ../
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge	tag 'tag-three' of ../
+0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge	tag 'tag-three-file' of ../
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge	tag 'tag-two' of ../

t/t5515/fetch.br-config-explicit new file +11 -0

new file mode 100644
index 0000000..e2fa9c8
@@ -0,0 +1,11 @@
+# br-config-explicit
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f		branch 'master' of ../
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	branch 'one' of ../
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge	branch 'two' of ../
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge	branch 'three' of ../
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge	tag 'tag-master' of ../
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	tag 'tag-one' of ../
+22feea448b023a2d864ef94b013735af34d238ba	not-for-merge	tag 'tag-one-tree' of ../
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge	tag 'tag-three' of ../
+0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge	tag 'tag-three-file' of ../
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge	tag 'tag-two' of ../

t/t5515/fetch.br-config-explicit-merge new file +11 -0

new file mode 100644
index 0000000..ec1a723
@@ -0,0 +1,11 @@
+# br-config-explicit-merge
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge	branch 'master' of ../
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	branch 'one' of ../
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge	branch 'two' of ../
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b		branch 'three' of ../
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge	tag 'tag-master' of ../
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	tag 'tag-one' of ../
+22feea448b023a2d864ef94b013735af34d238ba	not-for-merge	tag 'tag-one-tree' of ../
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge	tag 'tag-three' of ../
+0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge	tag 'tag-three-file' of ../
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge	tag 'tag-two' of ../

t/t5515/fetch.br-config-explicit-merge_config-explicit new file +11 -0

new file mode 100644
index 0000000..54f6891
@@ -0,0 +1,11 @@
+# br-config-explicit-merge config-explicit
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge	branch 'master' of ../
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	branch 'one' of ../
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge	branch 'two' of ../
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b		branch 'three' of ../
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge	tag 'tag-master' of ../
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	tag 'tag-one' of ../
+22feea448b023a2d864ef94b013735af34d238ba	not-for-merge	tag 'tag-one-tree' of ../
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge	tag 'tag-three' of ../
+0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge	tag 'tag-three-file' of ../
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge	tag 'tag-two' of ../

t/t5515/fetch.br-config-explicit-octopus new file +11 -0

new file mode 100644
index 0000000..7011dfc
@@ -0,0 +1,11 @@
+# br-config-explicit-octopus
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge	branch 'master' of ../
+8e32a6d901327a23ef831511badce7bf3bf46689		branch 'one' of ../
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8		branch 'two' of ../
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge	branch 'three' of ../
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge	tag 'tag-master' of ../
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	tag 'tag-one' of ../
+22feea448b023a2d864ef94b013735af34d238ba	not-for-merge	tag 'tag-one-tree' of ../
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge	tag 'tag-three' of ../
+0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge	tag 'tag-three-file' of ../
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge	tag 'tag-two' of ../

t/t5515/fetch.br-config-explicit-octopus_config-explicit new file +11 -0

new file mode 100644
index 0000000..bdad51f
@@ -0,0 +1,11 @@
+# br-config-explicit-octopus config-explicit
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge	branch 'master' of ../
+8e32a6d901327a23ef831511badce7bf3bf46689		branch 'one' of ../
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8		branch 'two' of ../
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge	branch 'three' of ../
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge	tag 'tag-master' of ../
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	tag 'tag-one' of ../
+22feea448b023a2d864ef94b013735af34d238ba	not-for-merge	tag 'tag-one-tree' of ../
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge	tag 'tag-three' of ../
+0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge	tag 'tag-three-file' of ../
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge	tag 'tag-two' of ../

t/t5515/fetch.br-config-explicit_config-explicit new file +11 -0

new file mode 100644
index 0000000..1b237dd
@@ -0,0 +1,11 @@
+# br-config-explicit config-explicit
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f		branch 'master' of ../
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	branch 'one' of ../
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge	branch 'two' of ../
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge	branch 'three' of ../
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge	tag 'tag-master' of ../
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	tag 'tag-one' of ../
+22feea448b023a2d864ef94b013735af34d238ba	not-for-merge	tag 'tag-one-tree' of ../
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge	tag 'tag-three' of ../
+0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge	tag 'tag-three-file' of ../
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge	tag 'tag-two' of ../

t/t5515/fetch.br-config-glob new file +11 -0

new file mode 100644
index 0000000..e75ec2f
@@ -0,0 +1,11 @@
+# br-config-glob
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge	branch 'master' of ../
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	branch 'one' of ../
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge	branch 'three' of ../
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge	branch 'two' of ../
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge	tag 'tag-master' of ../
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	tag 'tag-one' of ../
+22feea448b023a2d864ef94b013735af34d238ba	not-for-merge	tag 'tag-one-tree' of ../
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge	tag 'tag-three' of ../
+0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge	tag 'tag-three-file' of ../
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge	tag 'tag-two' of ../

t/t5515/fetch.br-config-glob-merge new file +11 -0

new file mode 100644
index 0000000..ce8f739
@@ -0,0 +1,11 @@
+# br-config-glob-merge
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge	branch 'master' of ../
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	branch 'one' of ../
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b		branch 'three' of ../
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge	branch 'two' of ../
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge	tag 'tag-master' of ../
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	tag 'tag-one' of ../
+22feea448b023a2d864ef94b013735af34d238ba	not-for-merge	tag 'tag-one-tree' of ../
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge	tag 'tag-three' of ../
+0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge	tag 'tag-three-file' of ../
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge	tag 'tag-two' of ../

t/t5515/fetch.br-config-glob-merge_config-glob new file +11 -0

new file mode 100644
index 0000000..5817bed
@@ -0,0 +1,11 @@
+# br-config-glob-merge config-glob
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge	branch 'master' of ../
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	branch 'one' of ../
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b		branch 'three' of ../
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge	branch 'two' of ../
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge	tag 'tag-master' of ../
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	tag 'tag-one' of ../
+22feea448b023a2d864ef94b013735af34d238ba	not-for-merge	tag 'tag-one-tree' of ../
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge	tag 'tag-three' of ../
+0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge	tag 'tag-three-file' of ../
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge	tag 'tag-two' of ../

t/t5515/fetch.br-config-glob-octopus new file +11 -0

new file mode 100644
index 0000000..9ee213e
@@ -0,0 +1,11 @@
+# br-config-glob-octopus
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge	branch 'master' of ../
+8e32a6d901327a23ef831511badce7bf3bf46689		branch 'one' of ../
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge	branch 'three' of ../
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge	branch 'two' of ../
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge	tag 'tag-master' of ../
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	tag 'tag-one' of ../
+22feea448b023a2d864ef94b013735af34d238ba	not-for-merge	tag 'tag-one-tree' of ../
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge	tag 'tag-three' of ../
+0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge	tag 'tag-three-file' of ../
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge	tag 'tag-two' of ../

t/t5515/fetch.br-config-glob-octopus_config-glob new file +11 -0

new file mode 100644
index 0000000..44bd0ec
@@ -0,0 +1,11 @@
+# br-config-glob-octopus config-glob
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge	branch 'master' of ../
+8e32a6d901327a23ef831511badce7bf3bf46689		branch 'one' of ../
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge	branch 'three' of ../
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge	branch 'two' of ../
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge	tag 'tag-master' of ../
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	tag 'tag-one' of ../
+22feea448b023a2d864ef94b013735af34d238ba	not-for-merge	tag 'tag-one-tree' of ../
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge	tag 'tag-three' of ../
+0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge	tag 'tag-three-file' of ../
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge	tag 'tag-two' of ../

t/t5515/fetch.br-config-glob_config-glob new file +11 -0

new file mode 100644
index 0000000..a6c20f9
@@ -0,0 +1,11 @@
+# br-config-glob config-glob
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge	branch 'master' of ../
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	branch 'one' of ../
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge	branch 'three' of ../
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge	branch 'two' of ../
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge	tag 'tag-master' of ../
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	tag 'tag-one' of ../
+22feea448b023a2d864ef94b013735af34d238ba	not-for-merge	tag 'tag-one-tree' of ../
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge	tag 'tag-three' of ../
+0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge	tag 'tag-three-file' of ../
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge	tag 'tag-two' of ../

t/t5515/fetch.br-remote-explicit new file +11 -0

new file mode 100644
index 0000000..83534d2
@@ -0,0 +1,11 @@
+# br-remote-explicit
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f		branch 'master' of ../
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	branch 'one' of ../
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge	branch 'two' of ../
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge	branch 'three' of ../
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge	tag 'tag-master' of ../
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	tag 'tag-one' of ../
+22feea448b023a2d864ef94b013735af34d238ba	not-for-merge	tag 'tag-one-tree' of ../
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge	tag 'tag-three' of ../
+0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge	tag 'tag-three-file' of ../
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge	tag 'tag-two' of ../

t/t5515/fetch.br-remote-explicit-merge new file +11 -0

new file mode 100644
index 0000000..a9064dd
@@ -0,0 +1,11 @@
+# br-remote-explicit-merge
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge	branch 'master' of ../
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	branch 'one' of ../
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge	branch 'two' of ../
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b		branch 'three' of ../
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge	tag 'tag-master' of ../
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	tag 'tag-one' of ../
+22feea448b023a2d864ef94b013735af34d238ba	not-for-merge	tag 'tag-one-tree' of ../
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge	tag 'tag-three' of ../
+0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge	tag 'tag-three-file' of ../
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge	tag 'tag-two' of ../

t/t5515/fetch.br-remote-explicit-merge_remote-explicit new file +11 -0

new file mode 100644
index 0000000..732a37e
@@ -0,0 +1,11 @@
+# br-remote-explicit-merge remote-explicit
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge	branch 'master' of ../
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	branch 'one' of ../
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge	branch 'two' of ../
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b		branch 'three' of ../
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge	tag 'tag-master' of ../
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	tag 'tag-one' of ../
+22feea448b023a2d864ef94b013735af34d238ba	not-for-merge	tag 'tag-one-tree' of ../
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge	tag 'tag-three' of ../
+0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge	tag 'tag-three-file' of ../
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge	tag 'tag-two' of ../

t/t5515/fetch.br-remote-explicit-octopus new file +11 -0

new file mode 100644
index 0000000..ecf020d
@@ -0,0 +1,11 @@
+# br-remote-explicit-octopus
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge	branch 'master' of ../
+8e32a6d901327a23ef831511badce7bf3bf46689		branch 'one' of ../
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8		branch 'two' of ../
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge	branch 'three' of ../
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge	tag 'tag-master' of ../
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	tag 'tag-one' of ../
+22feea448b023a2d864ef94b013735af34d238ba	not-for-merge	tag 'tag-one-tree' of ../
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge	tag 'tag-three' of ../
+0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge	tag 'tag-three-file' of ../
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge	tag 'tag-two' of ../

t/t5515/fetch.br-remote-explicit-octopus_remote-explicit new file +11 -0

new file mode 100644
index 0000000..af77531
@@ -0,0 +1,11 @@
+# br-remote-explicit-octopus remote-explicit
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge	branch 'master' of ../
+8e32a6d901327a23ef831511badce7bf3bf46689		branch 'one' of ../
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8		branch 'two' of ../
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge	branch 'three' of ../
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge	tag 'tag-master' of ../
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	tag 'tag-one' of ../
+22feea448b023a2d864ef94b013735af34d238ba	not-for-merge	tag 'tag-one-tree' of ../
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge	tag 'tag-three' of ../
+0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge	tag 'tag-three-file' of ../
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge	tag 'tag-two' of ../

t/t5515/fetch.br-remote-explicit_remote-explicit new file +11 -0

new file mode 100644
index 0000000..51fae56
@@ -0,0 +1,11 @@
+# br-remote-explicit remote-explicit
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f		branch 'master' of ../
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	branch 'one' of ../
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge	branch 'two' of ../
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge	branch 'three' of ../
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge	tag 'tag-master' of ../
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	tag 'tag-one' of ../
+22feea448b023a2d864ef94b013735af34d238ba	not-for-merge	tag 'tag-one-tree' of ../
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge	tag 'tag-three' of ../
+0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge	tag 'tag-three-file' of ../
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge	tag 'tag-two' of ../

t/t5515/fetch.br-remote-glob new file +11 -0

new file mode 100644
index 0000000..94e6ad3
@@ -0,0 +1,11 @@
+# br-remote-glob
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge	branch 'master' of ../
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	branch 'one' of ../
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge	branch 'three' of ../
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge	branch 'two' of ../
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge	tag 'tag-master' of ../
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	tag 'tag-one' of ../
+22feea448b023a2d864ef94b013735af34d238ba	not-for-merge	tag 'tag-one-tree' of ../
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge	tag 'tag-three' of ../
+0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge	tag 'tag-three-file' of ../
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge	tag 'tag-two' of ../

t/t5515/fetch.br-remote-glob-merge new file +11 -0

new file mode 100644
index 0000000..09362e2
@@ -0,0 +1,11 @@
+# br-remote-glob-merge
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge	branch 'master' of ../
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	branch 'one' of ../
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b		branch 'three' of ../
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge	branch 'two' of ../
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge	tag 'tag-master' of ../
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	tag 'tag-one' of ../
+22feea448b023a2d864ef94b013735af34d238ba	not-for-merge	tag 'tag-one-tree' of ../
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge	tag 'tag-three' of ../
+0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge	tag 'tag-three-file' of ../
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge	tag 'tag-two' of ../

t/t5515/fetch.br-remote-glob-merge_remote-glob new file +11 -0

new file mode 100644
index 0000000..e2eabec
@@ -0,0 +1,11 @@
+# br-remote-glob-merge remote-glob
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge	branch 'master' of ../
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	branch 'one' of ../
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b		branch 'three' of ../
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge	branch 'two' of ../
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge	tag 'tag-master' of ../
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	tag 'tag-one' of ../
+22feea448b023a2d864ef94b013735af34d238ba	not-for-merge	tag 'tag-one-tree' of ../
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge	tag 'tag-three' of ../
+0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge	tag 'tag-three-file' of ../
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge	tag 'tag-two' of ../

t/t5515/fetch.br-remote-glob-octopus new file +11 -0

new file mode 100644
index 0000000..c1554f8
@@ -0,0 +1,11 @@
+# br-remote-glob-octopus
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge	branch 'master' of ../
+8e32a6d901327a23ef831511badce7bf3bf46689		branch 'one' of ../
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge	branch 'three' of ../
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge	branch 'two' of ../
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge	tag 'tag-master' of ../
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	tag 'tag-one' of ../
+22feea448b023a2d864ef94b013735af34d238ba	not-for-merge	tag 'tag-one-tree' of ../
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge	tag 'tag-three' of ../
+0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge	tag 'tag-three-file' of ../
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge	tag 'tag-two' of ../

t/t5515/fetch.br-remote-glob-octopus_remote-glob new file +11 -0

new file mode 100644
index 0000000..e613434
@@ -0,0 +1,11 @@
+# br-remote-glob-octopus remote-glob
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge	branch 'master' of ../
+8e32a6d901327a23ef831511badce7bf3bf46689		branch 'one' of ../
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge	branch 'three' of ../
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge	branch 'two' of ../
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge	tag 'tag-master' of ../
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	tag 'tag-one' of ../
+22feea448b023a2d864ef94b013735af34d238ba	not-for-merge	tag 'tag-one-tree' of ../
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge	tag 'tag-three' of ../
+0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge	tag 'tag-three-file' of ../
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge	tag 'tag-two' of ../

t/t5515/fetch.br-remote-glob_remote-glob new file +11 -0

new file mode 100644
index 0000000..646dbc8
@@ -0,0 +1,11 @@
+# br-remote-glob remote-glob
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge	branch 'master' of ../
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	branch 'one' of ../
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge	branch 'three' of ../
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge	branch 'two' of ../
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge	tag 'tag-master' of ../
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	tag 'tag-one' of ../
+22feea448b023a2d864ef94b013735af34d238ba	not-for-merge	tag 'tag-one-tree' of ../
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge	tag 'tag-three' of ../
+0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge	tag 'tag-three-file' of ../
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge	tag 'tag-two' of ../

t/t5515/fetch.br-unconfig new file +11 -0

new file mode 100644
index 0000000..65ce6d9
@@ -0,0 +1,11 @@
+# br-unconfig
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge	branch 'master' of ../
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	branch 'one' of ../
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge	branch 'three' of ../
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge	branch 'two' of ../
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge	tag 'tag-master' of ../
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	tag 'tag-one' of ../
+22feea448b023a2d864ef94b013735af34d238ba	not-for-merge	tag 'tag-one-tree' of ../
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge	tag 'tag-three' of ../
+0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge	tag 'tag-three-file' of ../
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge	tag 'tag-two' of ../

t/t5515/fetch.br-unconfig_--tags_.._.git new file +7 -0

new file mode 100644
index 0000000..8258c80
@@ -0,0 +1,7 @@
+# br-unconfig --tags ../.git
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge	tag 'tag-master' of ../
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	tag 'tag-one' of ../
+22feea448b023a2d864ef94b013735af34d238ba	not-for-merge	tag 'tag-one-tree' of ../
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge	tag 'tag-three' of ../
+0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge	tag 'tag-three-file' of ../
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge	tag 'tag-two' of ../

t/t5515/fetch.br-unconfig_.._.git_one new file +2 -0

new file mode 100644
index 0000000..11eb5a6
@@ -0,0 +1,2 @@
+# br-unconfig ../.git one
+8e32a6d901327a23ef831511badce7bf3bf46689		branch 'one' of ../

t/t5515/fetch.br-unconfig_.._.git_one_tag_tag-one_tag_tag-three-file new file +8 -0

new file mode 100644
index 0000000..f02bab2
@@ -0,0 +1,8 @@
+# br-unconfig ../.git one tag tag-one tag tag-three-file
+8e32a6d901327a23ef831511badce7bf3bf46689		branch 'one' of ../
+8e32a6d901327a23ef831511badce7bf3bf46689		tag 'tag-one' of ../
+0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge	tag 'tag-three-file' of ../
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge	tag 'tag-master' of ../
+22feea448b023a2d864ef94b013735af34d238ba	not-for-merge	tag 'tag-one-tree' of ../
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge	tag 'tag-three' of ../
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge	tag 'tag-two' of ../

t/t5515/fetch.br-unconfig_.._.git_one_two new file +3 -0

new file mode 100644
index 0000000..3f1be22
@@ -0,0 +1,3 @@
+# br-unconfig ../.git one two
+8e32a6d901327a23ef831511badce7bf3bf46689		branch 'one' of ../
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8		branch 'two' of ../

t/t5515/fetch.br-unconfig_.._.git_tag_tag-one-tree_tag_tag-three-file new file +7 -0

new file mode 100644
index 0000000..85de411
@@ -0,0 +1,7 @@
+# br-unconfig ../.git tag tag-one-tree tag tag-three-file
+22feea448b023a2d864ef94b013735af34d238ba	not-for-merge	tag 'tag-one-tree' of ../
+0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge	tag 'tag-three-file' of ../
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge	tag 'tag-master' of ../
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	tag 'tag-one' of ../
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge	tag 'tag-three' of ../
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge	tag 'tag-two' of ../

t/t5515/fetch.br-unconfig_.._.git_tag_tag-one_tag_tag-three new file +7 -0

new file mode 100644
index 0000000..0da2337
@@ -0,0 +1,7 @@
+# br-unconfig ../.git tag tag-one tag tag-three
+8e32a6d901327a23ef831511badce7bf3bf46689		tag 'tag-one' of ../
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b		tag 'tag-three' of ../
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge	tag 'tag-master' of ../
+22feea448b023a2d864ef94b013735af34d238ba	not-for-merge	tag 'tag-one-tree' of ../
+0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge	tag 'tag-three-file' of ../
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge	tag 'tag-two' of ../

t/t5515/fetch.br-unconfig_branches-default new file +8 -0

new file mode 100644
index 0000000..fc7041e
@@ -0,0 +1,8 @@
+# br-unconfig branches-default
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f		branch 'master' of ../
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge	tag 'tag-master' of ../
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	tag 'tag-one' of ../
+22feea448b023a2d864ef94b013735af34d238ba	not-for-merge	tag 'tag-one-tree' of ../
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge	tag 'tag-three' of ../
+0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge	tag 'tag-three-file' of ../
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge	tag 'tag-two' of ../

t/t5515/fetch.br-unconfig_branches-one new file +8 -0

new file mode 100644
index 0000000..e94cde7
@@ -0,0 +1,8 @@
+# br-unconfig branches-one
+8e32a6d901327a23ef831511badce7bf3bf46689		branch 'one' of ../
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge	tag 'tag-master' of ../
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	tag 'tag-one' of ../
+22feea448b023a2d864ef94b013735af34d238ba	not-for-merge	tag 'tag-one-tree' of ../
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge	tag 'tag-three' of ../
+0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge	tag 'tag-three-file' of ../
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge	tag 'tag-two' of ../

t/t5515/fetch.br-unconfig_config-explicit new file +11 -0

new file mode 100644
index 0000000..01a283e
@@ -0,0 +1,11 @@
+# br-unconfig config-explicit
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f		branch 'master' of ../
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	branch 'one' of ../
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge	branch 'two' of ../
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge	branch 'three' of ../
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge	tag 'tag-master' of ../
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	tag 'tag-one' of ../
+22feea448b023a2d864ef94b013735af34d238ba	not-for-merge	tag 'tag-one-tree' of ../
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge	tag 'tag-three' of ../
+0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge	tag 'tag-three-file' of ../
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge	tag 'tag-two' of ../

t/t5515/fetch.br-unconfig_config-glob new file +11 -0

new file mode 100644
index 0000000..3a556c5
@@ -0,0 +1,11 @@
+# br-unconfig config-glob
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge	branch 'master' of ../
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	branch 'one' of ../
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge	branch 'three' of ../
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge	branch 'two' of ../
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge	tag 'tag-master' of ../
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	tag 'tag-one' of ../
+22feea448b023a2d864ef94b013735af34d238ba	not-for-merge	tag 'tag-one-tree' of ../
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge	tag 'tag-three' of ../
+0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge	tag 'tag-three-file' of ../
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge	tag 'tag-two' of ../

t/t5515/fetch.br-unconfig_remote-explicit new file +11 -0

new file mode 100644
index 0000000..db216df
@@ -0,0 +1,11 @@
+# br-unconfig remote-explicit
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f		branch 'master' of ../
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	branch 'one' of ../
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge	branch 'two' of ../
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge	branch 'three' of ../
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge	tag 'tag-master' of ../
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	tag 'tag-one' of ../
+22feea448b023a2d864ef94b013735af34d238ba	not-for-merge	tag 'tag-one-tree' of ../
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge	tag 'tag-three' of ../
+0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge	tag 'tag-three-file' of ../
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge	tag 'tag-two' of ../

t/t5515/fetch.br-unconfig_remote-glob new file +11 -0

new file mode 100644
index 0000000..aee65c2
@@ -0,0 +1,11 @@
+# br-unconfig remote-glob
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge	branch 'master' of ../
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	branch 'one' of ../
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge	branch 'three' of ../
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge	branch 'two' of ../
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge	tag 'tag-master' of ../
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	tag 'tag-one' of ../
+22feea448b023a2d864ef94b013735af34d238ba	not-for-merge	tag 'tag-one-tree' of ../
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge	tag 'tag-three' of ../
+0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge	tag 'tag-three-file' of ../
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge	tag 'tag-two' of ../

t/t5515/fetch.master new file +11 -0

new file mode 100644
index 0000000..950fd07
@@ -0,0 +1,11 @@
+# master
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge	branch 'master' of ../
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	branch 'one' of ../
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge	branch 'three' of ../
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge	branch 'two' of ../
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge	tag 'tag-master' of ../
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	tag 'tag-one' of ../
+22feea448b023a2d864ef94b013735af34d238ba	not-for-merge	tag 'tag-one-tree' of ../
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge	tag 'tag-three' of ../
+0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge	tag 'tag-three-file' of ../
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge	tag 'tag-two' of ../

t/t5515/fetch.master_--tags_.._.git new file +7 -0

new file mode 100644
index 0000000..0e59950
@@ -0,0 +1,7 @@
+# master --tags ../.git
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge	tag 'tag-master' of ../
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	tag 'tag-one' of ../
+22feea448b023a2d864ef94b013735af34d238ba	not-for-merge	tag 'tag-one-tree' of ../
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge	tag 'tag-three' of ../
+0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge	tag 'tag-three-file' of ../
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge	tag 'tag-two' of ../

t/t5515/fetch.master_.._.git_one new file +2 -0

new file mode 100644
index 0000000..35deddb
@@ -0,0 +1,2 @@
+# master ../.git one
+8e32a6d901327a23ef831511badce7bf3bf46689		branch 'one' of ../

t/t5515/fetch.master_.._.git_one_tag_tag-one_tag_tag-three-file new file +8 -0

new file mode 100644
index 0000000..8286852
@@ -0,0 +1,8 @@
+# master ../.git one tag tag-one tag tag-three-file
+8e32a6d901327a23ef831511badce7bf3bf46689		branch 'one' of ../
+8e32a6d901327a23ef831511badce7bf3bf46689		tag 'tag-one' of ../
+0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge	tag 'tag-three-file' of ../
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge	tag 'tag-master' of ../
+22feea448b023a2d864ef94b013735af34d238ba	not-for-merge	tag 'tag-one-tree' of ../
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge	tag 'tag-three' of ../
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge	tag 'tag-two' of ../

t/t5515/fetch.master_.._.git_one_two new file +3 -0

new file mode 100644
index 0000000..35ec578
@@ -0,0 +1,3 @@
+# master ../.git one two
+8e32a6d901327a23ef831511badce7bf3bf46689		branch 'one' of ../
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8		branch 'two' of ../

t/t5515/fetch.master_.._.git_tag_tag-one-tree_tag_tag-three-file new file +7 -0

new file mode 100644
index 0000000..2e133ef
@@ -0,0 +1,7 @@
+# master ../.git tag tag-one-tree tag tag-three-file
+22feea448b023a2d864ef94b013735af34d238ba	not-for-merge	tag 'tag-one-tree' of ../
+0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge	tag 'tag-three-file' of ../
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge	tag 'tag-master' of ../
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	tag 'tag-one' of ../
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge	tag 'tag-three' of ../
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge	tag 'tag-two' of ../

t/t5515/fetch.master_.._.git_tag_tag-one_tag_tag-three new file +7 -0

new file mode 100644
index 0000000..92b18b4
@@ -0,0 +1,7 @@
+# master ../.git tag tag-one tag tag-three
+8e32a6d901327a23ef831511badce7bf3bf46689		tag 'tag-one' of ../
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b		tag 'tag-three' of ../
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge	tag 'tag-master' of ../
+22feea448b023a2d864ef94b013735af34d238ba	not-for-merge	tag 'tag-one-tree' of ../
+0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge	tag 'tag-three-file' of ../
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge	tag 'tag-two' of ../

t/t5515/fetch.master_branches-default new file +8 -0

new file mode 100644
index 0000000..603d6d2
@@ -0,0 +1,8 @@
+# master branches-default
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f		branch 'master' of ../
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge	tag 'tag-master' of ../
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	tag 'tag-one' of ../
+22feea448b023a2d864ef94b013735af34d238ba	not-for-merge	tag 'tag-one-tree' of ../
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge	tag 'tag-three' of ../
+0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge	tag 'tag-three-file' of ../
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge	tag 'tag-two' of ../

t/t5515/fetch.master_branches-one new file +8 -0

new file mode 100644
index 0000000..fe9bb0b
@@ -0,0 +1,8 @@
+# master branches-one
+8e32a6d901327a23ef831511badce7bf3bf46689		branch 'one' of ../
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge	tag 'tag-master' of ../
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	tag 'tag-one' of ../
+22feea448b023a2d864ef94b013735af34d238ba	not-for-merge	tag 'tag-one-tree' of ../
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge	tag 'tag-three' of ../
+0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge	tag 'tag-three-file' of ../
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge	tag 'tag-two' of ../

t/t5515/fetch.master_config-explicit new file +11 -0

new file mode 100644
index 0000000..4be97c7
@@ -0,0 +1,11 @@
+# master config-explicit
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f		branch 'master' of ../
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	branch 'one' of ../
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge	branch 'two' of ../
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge	branch 'three' of ../
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge	tag 'tag-master' of ../
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	tag 'tag-one' of ../
+22feea448b023a2d864ef94b013735af34d238ba	not-for-merge	tag 'tag-one-tree' of ../
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge	tag 'tag-three' of ../
+0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge	tag 'tag-three-file' of ../
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge	tag 'tag-two' of ../

t/t5515/fetch.master_config-glob new file +11 -0

new file mode 100644
index 0000000..cb0726f
@@ -0,0 +1,11 @@
+# master config-glob
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge	branch 'master' of ../
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	branch 'one' of ../
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge	branch 'three' of ../
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge	branch 'two' of ../
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge	tag 'tag-master' of ../
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	tag 'tag-one' of ../
+22feea448b023a2d864ef94b013735af34d238ba	not-for-merge	tag 'tag-one-tree' of ../
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge	tag 'tag-three' of ../
+0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge	tag 'tag-three-file' of ../
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge	tag 'tag-two' of ../

t/t5515/fetch.master_remote-explicit new file +11 -0

new file mode 100644
index 0000000..44a1ca8
@@ -0,0 +1,11 @@
+# master remote-explicit
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f		branch 'master' of ../
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	branch 'one' of ../
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge	branch 'two' of ../
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge	branch 'three' of ../
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge	tag 'tag-master' of ../
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	tag 'tag-one' of ../
+22feea448b023a2d864ef94b013735af34d238ba	not-for-merge	tag 'tag-one-tree' of ../
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge	tag 'tag-three' of ../
+0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge	tag 'tag-three-file' of ../
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge	tag 'tag-two' of ../

t/t5515/fetch.master_remote-glob new file +11 -0

new file mode 100644
index 0000000..724e8db
@@ -0,0 +1,11 @@
+# master remote-glob
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge	branch 'master' of ../
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	branch 'one' of ../
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge	branch 'three' of ../
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge	branch 'two' of ../
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge	tag 'tag-master' of ../
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	tag 'tag-one' of ../
+22feea448b023a2d864ef94b013735af34d238ba	not-for-merge	tag 'tag-one-tree' of ../
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge	tag 'tag-three' of ../
+0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge	tag 'tag-three-file' of ../
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge	tag 'tag-two' of ../

Signature · 1 line

1.5.0.2.878.g38f47

Junio C Hamano

2016-06-15 22:42 UTC #4 lore raw

Quoted 1 line · Santi Béjar

P.D.: When sended this way the From: must be quoted or in UTF-8?

Absolutely not.

Joshua N Pritikin

2016-06-15 22:42 UTC #5 lore raw

Quoted 4 lines · Junio C Hamano

Quoted 1 line · Santi Béjar
P.D.: When sended this way the From: must be quoted or in UTF-8?
Absolutely not.

I think Junio meant that UTF-8 is OK. At least it is okay here in mutt.

Junio C Hamano

2016-06-15 22:42 UTC #6 lore raw

Quoted 7 lines · Joshua N Pritikin

Quoted 4 lines · Junio C Hamano
Quoted 1 line · Santi Béjar
P.D.: When sended this way the From: must be quoted or in UTF-8?
Absolutely not.
I think Junio meant that UTF-8 is OK. At least it is okay here in mutt.

Correct. Sorry to be too terse. It is my bad habit I cannot shake off. My apologies to Santi and you for clarifying.

When you override the author name with an in-body From: line, that line is just part of the body text and you do not have to (and you shouldn't) quote as in the real From: header.

Santi Béjar

author

2016-06-15 22:42 UTC #7 lore raw

In reply to Joshua N Pritikin

Quoted 7 lines · Joshua N Pritikin

Quoted 4 lines · Junio C Hamano
Quoted 1 line · Santi Béjar
P.D.: When sended this way the From: must be quoted or in UTF-8?
Absolutely not.
I think Junio meant that UTF-8 is OK. At least it is okay here in mutt.

OK, thanks. So the next question is if git-format-patch needs a flag to indicate that?

--in-body?

Santi

Junio C Hamano

2016-06-15 22:42 UTC #8 lore raw

Quoted 11 lines · Santi Béjar

Quoted 7 lines · Joshua N Pritikin
Quoted 4 lines · Junio C Hamano
Quoted 1 line · Santi Béjar
P.D.: When sended this way the From: must be quoted or in UTF-8?
Absolutely not.
I think Junio meant that UTF-8 is OK. At least it is okay here in mutt.
OK, thanks. So the next question is if git-format-patch needs a flag to indicate that?

I do not think so. It is a tool to produce a fake mailbox, and when it says "From: " it really means it is producing the header line.

Junio C Hamano

2016-06-15 22:42 UTC #9 lore raw

In reply to Junio C Hamano

Quoted 5 lines · Junio C Hamano

Quoted 1 line · Santi Béjar
P.D.: When sended this way the From: must be quoted or in UTF-8?
Absolutely not.

But there is no need to resend. I'll apply it to 'master' before going to bed.

Thanks.