development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-09-13 05:14:36 +00:00
Code Issues Packages Projects Releases Wiki Activity
36644 commits 6 branches 951 tags 512 MiB
Commit graph

2 commits

Author SHA1 Message Date
Linus Torvalds 7a2b128d13 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>
 2011-11-04 21:40:25 -07:00
Santi Béjar ac3ec0d555 t/t5515-fetch-merge-logic.sh: Added tests for the merge login in git-fetch 
Signed-off-by: Santi Béjar <sbejar@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
 2007-03-05 00:27:37 -08:00