FETCH_HEAD documentation vs reality
While trying to find some documentation of the format of .git/FETCH_HEAD, I found this example in git-read-tree.txt, which I think will no longer work. Probably when this was written, .git/FETCH_HEAD contained only a single SHA; it's much more complicated now.
$ JC=`git rev-parse --verify "HEAD^0"`
$ git checkout-index -f -u -a $JC
...
$ git fetch git://.... linus
$ LT=`cat .git/FETCH_HEAD`
...
$ git read-tree -m -u `git merge-base $JC $LT` $JC $LTIt's also common for the first line of .git/FETCH_HEAD to be an arbitrary branch that was fetched (as part of an unqualified "git pull"), marked not-for-merge. So using "FETCH_HEAD" as a refname will refer to such a branch unintentionally. There are several places in the docs that seem to expect FETCH_HEAD to always refer to the one that was fetched and will be merged (ie, master):
revisions.txt:
'FETCH_HEAD' records the branch which you fetched from a remote repository with your last git fetch invocation.
git-pull.txt:
In its default mode, git pull is shorthand for git fetch followed by git merge FETCH_HEAD.
gittutorial.txt:
alice$ git log -p HEAD..FETCH_HEAD
$ gitk HEAD..FETCH_HEAD
howto/rebase-from-internal-branch.txt:
You fetch from upstream, but not merge.
$ git fetch upstream
This leaves the updated upstream head in .git/FETCH_HEAD but does not touch your .git/HEAD nor .git/refs/heads/master. You run "git rebase" now.
$ git rebase FETCH_HEAD master
All this documentation could be changed, or resolve_ref_unsafe in refs.c could be changed to have a special case parser for .git/FETCH_HEAD, that finds the first branch that is marked for merge, where it now has this minor special case for it:
/* Please note that FETCH_HEAD has a second line containing other data. */
if (get_sha1_hex(buffer, sha1) || (buffer[40] != '\0' && !isspace(buffer[40]))) {Or yet another way to fix it would be to make git fetch always write the intended FETCH_HEAD first into .git/FETCH_HEAD. (When not in --append mode.) This seems like perhaps the best fix, although it does mean that if a fetch is done of only not-for-merge refs, without --append, FETCH_HEAD will still refer to one of them.
I've attached a minimal proof-of-concept patch implementing this last option.
Signature · 1 line
see shy jo
builtin/fetch.c +10 -0
@@ -376,6 +376,7 @@ static int store_updated_refs(const char *raw_url, const char *remote_name,struct strbuf note =STRBUF_INIT ;const char *what, *kind;struct ref *rm; +int top =1 ;char *url, *filename = dry_run ?"/dev/null" :git_path ("FETCH_HEAD" ); fp =fopen (filename,"a" );
@@ -393,6 +394,7 @@ static int store_updated_refs(const char *raw_url, const char *remote_name, goto abort; } + write:for (rm = ref_map; rm; rm = rm->next) {struct ref *ref =NULL ;
@@ -408,6 +410,9 @@ static int store_updated_refs(const char *raw_url, const char *remote_name,if (!commit) rm->merge =0 ; +if (top != rm->merge) +continue ; +if (!strcmp (rm->name,"HEAD" )) { kind ="" ; what ="" ;
@@ -474,6 +479,11 @@ static int store_updated_refs(const char *raw_url, const char *remote_name, } } +if (top) { + top =0 ; + goto write; + } +if (rc &STORE_REF_ERROR_DF_CONFLICT ) error(_("some local refs could not be updated; try running\n" " 'git remote prune %s' to remove any old, conflicting "
Quoted 3 lines · Joey Hess
Or yet another way to fix it would be to make git fetch always write the intended
FETCH_HEADfirst into .git/FETCH_HEAD. (When not in --append mode.) This seems like perhaps the best fix,...
Sounds good, if you mean "the first one that is marked as for-merge" by "intended FETCH_HEAD".
Thanks. Please make it so.
PATCH 1/1 write first for-merge ref to FETCH_HEAD first
The FETCH_HEAD refname is supposed to refer to the ref that was fetched and should be merged. However all fetched refs are written to .git/FETCH_HEAD in an arbitrary order, and resolve_ref_unsafe simply takes the first ref as the FETCH_HEAD, which is often the wrong one, when other branches were also fetched.
The solution is to write the for-merge ref(s) to FETCH_HEAD first. Then, unless --append is used, the FETCH_HEAD refname behaves as intended. If the user uses --append, they presumably are doing so in order to preserve the old FETCH_HEAD.
Also included a fix to documentation that assumes FETCH_HEAD contains only a single ref.
--- Documentation/git-read-tree.txt | 2 +- builtin/fetch.c | 158 +++++++++++++++++++++------------------ 2 files changed, 85 insertions(+), 75 deletions(-)
Documentation/git-read-tree.txt +1 -1
@@ -342,7 +342,7 @@ since you pulled from him: ---------------- $ git fetch git://.... linus -$ LT=`cat .git/FETCH_HEAD` +$ LT=`git rev-parse FETCH_HEAD` ---------------- Your work tree is still based on your HEAD ($JC), but you have
builtin/fetch.c +84 -74
174 lines not on this page · raw message
Signature · 1 line
1.7.7.3
Re: [PATCH] write first for-merge ref to FETCH_HEAD first
Quoted 6 lines · Joey Hess
The
FETCH_HEADrefname is supposed to refer to the ref that was fetched and should be merged. However all fetched refs are written to .git/FETCH_HEAD in an arbitrary order, andresolve_ref_unsafesimply takes the first ref as theFETCH_HEAD, which is often the wrong one, when other branches were also fetched.
Quoted 7 lines
The solution is to write the for-merge ref(s) to
FETCH_HEADfirst. Then, unless --append is used, theFETCH_HEADrefname behaves as intended. If the user uses --append, they presumably are doing so in order to preserve the oldFETCH_HEAD.Also included a fix to documentation that assumes
FETCH_HEADcontains only a single ref.
That "single ref" assumption is perfectly fine for the part of the documentation you patched, actually. The "fetch" command-line the example shows explicitly fetches a single ref.
It is a good idea to use rev-parse anyway, so the patch itself is good. A potential problem of that example (I haven't re-tried these examples for eons since they were written) comes from the fact that FETCH_HEAD contains not just the object name of what we fetched, but also other information to describe what happened to that fetched object.
Quoted 1 line
---
Sign-off?
Quoted 3 lines
Documentation/git-read-tree.txt | 2 +- builtin/fetch.c | 158 +++++++++++++++++++++------------------ 2 files changed, 85 insertions(+), 75 deletions(-)
Re: [PATCH] write first for-merge ref to FETCH_HEAD first
Quoted 8 lines · Junio C Hamano
Quoted 6 lines · Joey Hess
The
FETCH_HEADrefname is supposed to refer to the ref that was fetched and should be merged. However all fetched refs are written to .git/FETCH_HEAD in an arbitrary order, andresolve_ref_unsafesimply takes the first ref as theFETCH_HEAD, which is often the wrong one, when other branches were also fetched.
Quoted 4 lines
Quoted 2 lines
The solution is to write the for-merge ref(s) to
FETCH_HEADfirst.
...Sign-off?
Ping? I think this is a good change to go in before 1.7.9.
The change broke quite a lot of tests, and I think I've fixed them all.
-- >8 --
From: Joey Hess <[email protected]>
Date: Mon, 26 Dec 2011 12:16:56 -0400
Subject: [PATCH] write first for-merge ref to FETCH_HEAD first
The FETCH_HEAD refname is supposed to refer to the ref that was fetched and should be merged. However all fetched refs are written to .git/FETCH_HEAD in an arbitrary order, and resolve_ref_unsafe simply takes the first ref as the FETCH_HEAD, which is often the wrong one, when other branches were also fetched.
The solution is to write the for-merge ref(s) to FETCH_HEAD first. Then, unless --append is used, the FETCH_HEAD refname behaves as intended. If the user uses --append, they presumably are doing so in order to preserve the old FETCH_HEAD.
While we are at it, update an old example in the read-tree documentation that implied that each entry in FETCH_HEAD only has the object name, which is not true for quite a while.
--- Documentation/git-read-tree.txt | 2 +- builtin/fetch.c | 160 +++++++++++--------- t/t5510-fetch.sh | 2 +- t/t5515/fetch.br-branches-default-merge | 2 +- ...etch.br-branches-default-merge_branches-default | 2 +- t/t5515/fetch.br-branches-default-octopus | 2 +- ...ch.br-branches-default-octopus_branches-default | 2 +- t/t5515/fetch.br-branches-one-merge | 2 +- t/t5515/fetch.br-branches-one-merge_branches-one | 2 +- t/t5515/fetch.br-config-explicit-merge | 2 +- .../fetch.br-config-explicit-merge_config-explicit | 2 +- t/t5515/fetch.br-config-explicit-octopus | 2 +- ...etch.br-config-explicit-octopus_config-explicit | 2 +- t/t5515/fetch.br-config-glob-merge | 2 +- t/t5515/fetch.br-config-glob-merge_config-glob | 2 +- t/t5515/fetch.br-config-glob-octopus | 4 +- t/t5515/fetch.br-config-glob-octopus_config-glob | 4 +- t/t5515/fetch.br-remote-explicit-merge | 2 +- .../fetch.br-remote-explicit-merge_remote-explicit | 2 +- t/t5515/fetch.br-remote-explicit-octopus | 2 +- ...etch.br-remote-explicit-octopus_remote-explicit | 2 +- t/t5515/fetch.br-remote-glob-merge | 2 +- t/t5515/fetch.br-remote-glob-merge_remote-glob | 2 +- t/t5515/fetch.br-remote-glob-octopus | 4 +- t/t5515/fetch.br-remote-glob-octopus_remote-glob | 4 +- 25 files changed, 114 insertions(+), 102 deletions(-)
Documentation/git-read-tree.txt +1 -1
@@ -342,7 +342,7 @@ since you pulled from him: ---------------- $ git fetch git://.... linus -$ LT=`cat .git/FETCH_HEAD` +$ LT=`git rev-parse FETCH_HEAD` ---------------- Your work tree is still based on your HEAD ($JC), but you have
builtin/fetch.c +86 -74
176 lines not on this page · raw message
t/t5510-fetch.sh +1 -1
@@ -70,8 +70,8 @@ test_expect_success "fetch test for-merge" ' master_in_two=`cd ../two && git rev-parse master` && one_in_two=`cd ../two && git rev-parse one` && { - echo "$master_in_two not-for-merge" echo "$one_in_two " + echo "$master_in_two not-for-merge" } >expected && cut -f -2 .git/FETCH_HEAD >actual && test_cmp expected actual'
t/t5515/fetch.br-branches-default-merge +1 -1
@@ -1,6 +1,6 @@ # br-branches-default-merge -754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge branch 'master' of ../ 0567da4d5edd2ff4bb292a465ba9e64dcad9536b branch 'three' of ../ +754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge branch 'master' of ../ 6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../ 8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../ 22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../
t/t5515/fetch.br-branches-default-merge_branches-default +1 -1
@@ -1,6 +1,6 @@ # br-branches-default-merge branches-default -754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge branch 'master' of ../ 0567da4d5edd2ff4bb292a465ba9e64dcad9536b branch 'three' of ../ +754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge branch 'master' of ../ 6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../ 8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../ 22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../
t/t5515/fetch.br-branches-default-octopus +1 -1
@@ -1,7 +1,7 @@ # br-branches-default-octopus -754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge branch 'master' of ../ 8e32a6d901327a23ef831511badce7bf3bf46689 branch 'one' of ../ 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 branch 'two' of ../ +754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge branch 'master' of ../ 6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../ 8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../ 22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../
t/t5515/fetch.br-branches-default-octopus_branches-default +1 -1
@@ -1,7 +1,7 @@ # br-branches-default-octopus branches-default -754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge branch 'master' of ../ 8e32a6d901327a23ef831511badce7bf3bf46689 branch 'one' of ../ 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 branch 'two' of ../ +754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge branch 'master' of ../ 6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../ 8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../ 22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../
t/t5515/fetch.br-branches-one-merge +1 -1
@@ -1,6 +1,6 @@ # br-branches-one-merge -8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge branch 'one' of ../ 0567da4d5edd2ff4bb292a465ba9e64dcad9536b branch 'three' of ../ +8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge branch 'one' of ../ 6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../ 8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../ 22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../
t/t5515/fetch.br-branches-one-merge_branches-one +1 -1
@@ -1,6 +1,6 @@ # br-branches-one-merge branches-one -8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge branch 'one' of ../ 0567da4d5edd2ff4bb292a465ba9e64dcad9536b branch 'three' of ../ +8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge branch 'one' of ../ 6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../ 8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../ 22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../
t/t5515/fetch.br-config-explicit-merge +1 -1
@@ -1,8 +1,8 @@ # br-config-explicit-merge +0567da4d5edd2ff4bb292a465ba9e64dcad9536b branch 'three' of ../ 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 ../ 6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../ 8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../ 22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../
t/t5515/fetch.br-config-explicit-merge_config-explicit +1 -1
@@ -1,8 +1,8 @@ # br-config-explicit-merge config-explicit +0567da4d5edd2ff4bb292a465ba9e64dcad9536b branch 'three' of ../ 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 ../ 6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../ 8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../ 22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../
t/t5515/fetch.br-config-explicit-octopus +1 -1
@@ -1,7 +1,7 @@ # br-config-explicit-octopus -754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge branch 'master' of ../ 8e32a6d901327a23ef831511badce7bf3bf46689 branch 'one' of ../ 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 branch 'two' of ../ +754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge branch 'master' of ../ 0567da4d5edd2ff4bb292a465ba9e64dcad9536b not-for-merge branch 'three' of ../ 6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../ 8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../
t/t5515/fetch.br-config-explicit-octopus_config-explicit +1 -1
@@ -1,7 +1,7 @@ # br-config-explicit-octopus config-explicit -754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge branch 'master' of ../ 8e32a6d901327a23ef831511badce7bf3bf46689 branch 'one' of ../ 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 branch 'two' of ../ +754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge branch 'master' of ../ 0567da4d5edd2ff4bb292a465ba9e64dcad9536b not-for-merge branch 'three' of ../ 6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../ 8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../
t/t5515/fetch.br-config-glob-merge +1 -1
@@ -1,7 +1,7 @@ # br-config-glob-merge +0567da4d5edd2ff4bb292a465ba9e64dcad9536b branch 'three' of ../ 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 ../ 6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../ 8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../
t/t5515/fetch.br-config-glob-merge_config-glob +1 -1
@@ -1,7 +1,7 @@ # br-config-glob-merge config-glob +0567da4d5edd2ff4bb292a465ba9e64dcad9536b branch 'three' of ../ 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 ../ 6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../ 8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../
t/t5515/fetch.br-config-glob-octopus +2 -2
@@ -1,8 +1,8 @@ # br-config-glob-octopus -754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge branch 'master' of ../ 8e32a6d901327a23ef831511badce7bf3bf46689 branch 'one' of ../ -0567da4d5edd2ff4bb292a465ba9e64dcad9536b not-for-merge branch 'three' of ../ 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 branch 'two' of ../ +754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge branch 'master' of ../ +0567da4d5edd2ff4bb292a465ba9e64dcad9536b not-for-merge branch 'three' of ../ 6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../ 8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../ 22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../
t/t5515/fetch.br-config-glob-octopus_config-glob +2 -2
@@ -1,8 +1,8 @@ # 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 branch 'two' of ../ +754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge branch 'master' of ../ +0567da4d5edd2ff4bb292a465ba9e64dcad9536b not-for-merge branch 'three' of ../ 6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../ 8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../ 22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../
t/t5515/fetch.br-remote-explicit-merge +1 -1
@@ -1,8 +1,8 @@ # br-remote-explicit-merge +0567da4d5edd2ff4bb292a465ba9e64dcad9536b branch 'three' of ../ 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 ../ 6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../ 8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../ 22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../
t/t5515/fetch.br-remote-explicit-merge_remote-explicit +1 -1
@@ -1,8 +1,8 @@ # br-remote-explicit-merge remote-explicit +0567da4d5edd2ff4bb292a465ba9e64dcad9536b branch 'three' of ../ 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 ../ 6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../ 8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../ 22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../
t/t5515/fetch.br-remote-explicit-octopus +1 -1
@@ -1,7 +1,7 @@ # br-remote-explicit-octopus -754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge branch 'master' of ../ 8e32a6d901327a23ef831511badce7bf3bf46689 branch 'one' of ../ 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 branch 'two' of ../ +754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge branch 'master' of ../ 0567da4d5edd2ff4bb292a465ba9e64dcad9536b not-for-merge branch 'three' of ../ 6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../ 8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../
t/t5515/fetch.br-remote-explicit-octopus_remote-explicit +1 -1
@@ -1,7 +1,7 @@ # br-remote-explicit-octopus remote-explicit -754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge branch 'master' of ../ 8e32a6d901327a23ef831511badce7bf3bf46689 branch 'one' of ../ 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 branch 'two' of ../ +754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge branch 'master' of ../ 0567da4d5edd2ff4bb292a465ba9e64dcad9536b not-for-merge branch 'three' of ../ 6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../ 8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../
t/t5515/fetch.br-remote-glob-merge +1 -1
@@ -1,7 +1,7 @@ # br-remote-glob-merge +0567da4d5edd2ff4bb292a465ba9e64dcad9536b branch 'three' of ../ 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 ../ 6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../ 8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../
t/t5515/fetch.br-remote-glob-merge_remote-glob +1 -1
@@ -1,7 +1,7 @@ # br-remote-glob-merge remote-glob +0567da4d5edd2ff4bb292a465ba9e64dcad9536b branch 'three' of ../ 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 ../ 6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../ 8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../
t/t5515/fetch.br-remote-glob-octopus +2 -2
@@ -1,8 +1,8 @@ # br-remote-glob-octopus -754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge branch 'master' of ../ 8e32a6d901327a23ef831511badce7bf3bf46689 branch 'one' of ../ -0567da4d5edd2ff4bb292a465ba9e64dcad9536b not-for-merge branch 'three' of ../ 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 branch 'two' of ../ +754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge branch 'master' of ../ +0567da4d5edd2ff4bb292a465ba9e64dcad9536b not-for-merge branch 'three' of ../ 6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../ 8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../ 22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../
t/t5515/fetch.br-remote-glob-octopus_remote-glob +2 -2
@@ -1,8 +1,8 @@ # 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 branch 'two' of ../ +754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge branch 'master' of ../ +0567da4d5edd2ff4bb292a465ba9e64dcad9536b not-for-merge branch 'three' of ../ 6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../ 8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../ 22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../
Signature · 1 line
1.7.8.2.334.ge177b0f
Re: [PATCH] write first for-merge ref to FETCH_HEAD first
Quoted 3 lines · Junio C Hamano
Ping? I think this is a good change to go in before 1.7.9.
The change broke quite a lot of tests, and I think I've fixed them all.
(Hope that's enough!)
Signature · 1 line
see shy jo
Re: [PATCH] write first for-merge ref to FETCH_HEAD first
Quoted 8 lines · Joey Hess
Quoted 3 lines · Junio C Hamano
Ping? I think this is a good change to go in before 1.7.9.
The change broke quite a lot of tests, and I think I've fixed them all.
Signed-off-by Joey Hess <[email protected]>(Hope that's enough!)
Yes. Thanks.