| commit | 7a2b128d13d880635e7317a9208cfa42a660f143 | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Thu, 3 Nov 2011 02:19:34 +0000 (2 19:19 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sat, 5 Nov 2011 04:40:25 +0000 (4 21:40 -0700) | ||
| tree | 86f3be42cb2b04dee0c5432eedfae027f1ace9f4 | treesnapshot (tar.gz zip) |
| parent | 2f47eae2a1337bd0cb50dbc936df6433f460bb4a | commitdiff |
fetch: do not store peeled tag object names in FETCH_HEAD
We do not want to record tags as parents of a merge when the user does
"git pull $there tag v1.0" to merge tagged commit, but that is not a good
enough excuse to peel the tag down to commit when storing in FETCH_HEAD.
The caller of underlying "git fetch $there tag v1.0" may have other uses
of information contained in v1.0 tag in mind.
[jc: the test adjustment is to update for the new expectation]
Signed-off-by: Junio C Hamano <gitster@pobox.com>
We do not want to record tags as parents of a merge when the user does
"git pull $there tag v1.0" to merge tagged commit, but that is not a good
enough excuse to peel the tag down to commit when storing in FETCH_HEAD.
The caller of underlying "git fetch $there tag v1.0" may have other uses
of information contained in v1.0 tag in mind.
[jc: the test adjustment is to update for the new expectation]
Signed-off-by: Junio C Hamano <gitster@pobox.com>
59 files changed: