mirror of
https://github.com/git/git.git
synced 2024-11-24 10:26:17 +08:00
7a2b128d13
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>
9 lines
569 B
Plaintext
9 lines
569 B
Plaintext
# br-unconfig branches-default
|
|
754b754407bf032e9a2f9d5a9ad05ca79a6b228f 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 ../
|
|
c61a82b60967180544e3c19f819ddbd0c9f89899 not-for-merge tag 'tag-three' of ../
|
|
0e3b14047d3ee365f4f2a1b673db059c3972589c not-for-merge tag 'tag-three-file' of ../
|
|
525b7fb068d59950d185a8779dc957c77eed73ba not-for-merge tag 'tag-two' of ../
|