development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-10-28 19:25:47 +00:00
Code Issues Projects Releases Packages Wiki Activity
git/t/t5515
History
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
..
fetch.br-branches-default fetch: do not store peeled tag object names in FETCH_HEAD 2011-11-04 21:40:25 -07:00
fetch.br-branches-default-merge fetch: do not store peeled tag object names in FETCH_HEAD 2011-11-04 21:40:25 -07:00
fetch.br-branches-default-merge_branches-default fetch: do not store peeled tag object names in FETCH_HEAD 2011-11-04 21:40:25 -07:00
fetch.br-branches-default-octopus fetch: do not store peeled tag object names in FETCH_HEAD 2011-11-04 21:40:25 -07:00
fetch.br-branches-default-octopus_branches-default fetch: do not store peeled tag object names in FETCH_HEAD 2011-11-04 21:40:25 -07:00
fetch.br-branches-default_branches-default fetch: do not store peeled tag object names in FETCH_HEAD 2011-11-04 21:40:25 -07:00
fetch.br-branches-one fetch: do not store peeled tag object names in FETCH_HEAD 2011-11-04 21:40:25 -07:00
fetch.br-branches-one-merge fetch: do not store peeled tag object names in FETCH_HEAD 2011-11-04 21:40:25 -07:00
fetch.br-branches-one-merge_branches-one fetch: do not store peeled tag object names in FETCH_HEAD 2011-11-04 21:40:25 -07:00
fetch.br-branches-one-octopus fetch: do not store peeled tag object names in FETCH_HEAD 2011-11-04 21:40:25 -07:00
fetch.br-branches-one-octopus_branches-one fetch: do not store peeled tag object names in FETCH_HEAD 2011-11-04 21:40:25 -07:00
fetch.br-branches-one_branches-one fetch: do not store peeled tag object names in FETCH_HEAD 2011-11-04 21:40:25 -07:00
fetch.br-config-explicit fetch: do not store peeled tag object names in FETCH_HEAD 2011-11-04 21:40:25 -07:00
fetch.br-config-explicit-merge fetch: do not store peeled tag object names in FETCH_HEAD 2011-11-04 21:40:25 -07:00
fetch.br-config-explicit-merge_config-explicit fetch: do not store peeled tag object names in FETCH_HEAD 2011-11-04 21:40:25 -07:00
fetch.br-config-explicit-octopus fetch: do not store peeled tag object names in FETCH_HEAD 2011-11-04 21:40:25 -07:00
fetch.br-config-explicit-octopus_config-explicit fetch: do not store peeled tag object names in FETCH_HEAD 2011-11-04 21:40:25 -07:00
fetch.br-config-explicit_config-explicit fetch: do not store peeled tag object names in FETCH_HEAD 2011-11-04 21:40:25 -07:00
fetch.br-config-glob fetch: do not store peeled tag object names in FETCH_HEAD 2011-11-04 21:40:25 -07:00
fetch.br-config-glob-merge fetch: do not store peeled tag object names in FETCH_HEAD 2011-11-04 21:40:25 -07:00
fetch.br-config-glob-merge_config-glob fetch: do not store peeled tag object names in FETCH_HEAD 2011-11-04 21:40:25 -07:00
fetch.br-config-glob-octopus fetch: do not store peeled tag object names in FETCH_HEAD 2011-11-04 21:40:25 -07:00
fetch.br-config-glob-octopus_config-glob fetch: do not store peeled tag object names in FETCH_HEAD 2011-11-04 21:40:25 -07:00
fetch.br-config-glob_config-glob fetch: do not store peeled tag object names in FETCH_HEAD 2011-11-04 21:40:25 -07:00
fetch.br-remote-explicit fetch: do not store peeled tag object names in FETCH_HEAD 2011-11-04 21:40:25 -07:00
fetch.br-remote-explicit-merge fetch: do not store peeled tag object names in FETCH_HEAD 2011-11-04 21:40:25 -07:00
fetch.br-remote-explicit-merge_remote-explicit fetch: do not store peeled tag object names in FETCH_HEAD 2011-11-04 21:40:25 -07:00
fetch.br-remote-explicit-octopus fetch: do not store peeled tag object names in FETCH_HEAD 2011-11-04 21:40:25 -07:00
fetch.br-remote-explicit-octopus_remote-explicit fetch: do not store peeled tag object names in FETCH_HEAD 2011-11-04 21:40:25 -07:00
fetch.br-remote-explicit_remote-explicit fetch: do not store peeled tag object names in FETCH_HEAD 2011-11-04 21:40:25 -07:00
fetch.br-remote-glob fetch: do not store peeled tag object names in FETCH_HEAD 2011-11-04 21:40:25 -07:00
fetch.br-remote-glob-merge fetch: do not store peeled tag object names in FETCH_HEAD 2011-11-04 21:40:25 -07:00
fetch.br-remote-glob-merge_remote-glob fetch: do not store peeled tag object names in FETCH_HEAD 2011-11-04 21:40:25 -07:00
fetch.br-remote-glob-octopus fetch: do not store peeled tag object names in FETCH_HEAD 2011-11-04 21:40:25 -07:00
fetch.br-remote-glob-octopus_remote-glob fetch: do not store peeled tag object names in FETCH_HEAD 2011-11-04 21:40:25 -07:00
fetch.br-remote-glob_remote-glob fetch: do not store peeled tag object names in FETCH_HEAD 2011-11-04 21:40:25 -07:00
fetch.br-unconfig fetch: do not store peeled tag object names in FETCH_HEAD 2011-11-04 21:40:25 -07:00
fetch.br-unconfig_--tags_.._.git fetch: do not store peeled tag object names in FETCH_HEAD 2011-11-04 21:40:25 -07:00
fetch.br-unconfig_.._.git t/t5515-fetch-merge-logic.sh: Add two more tests 2007-03-07 10:22:44 -08:00
fetch.br-unconfig_.._.git_one
fetch.br-unconfig_.._.git_one_tag_tag-one_tag_tag-three-file fetch: do not store peeled tag object names in FETCH_HEAD 2011-11-04 21:40:25 -07:00
fetch.br-unconfig_.._.git_one_two
fetch.br-unconfig_.._.git_tag_tag-one-tree_tag_tag-three-file fetch: do not store peeled tag object names in FETCH_HEAD 2011-11-04 21:40:25 -07:00
fetch.br-unconfig_.._.git_tag_tag-one_tag_tag-three fetch: do not store peeled tag object names in FETCH_HEAD 2011-11-04 21:40:25 -07:00
fetch.br-unconfig_branches-default fetch: do not store peeled tag object names in FETCH_HEAD 2011-11-04 21:40:25 -07:00
fetch.br-unconfig_branches-one fetch: do not store peeled tag object names in FETCH_HEAD 2011-11-04 21:40:25 -07:00
fetch.br-unconfig_config-explicit fetch: do not store peeled tag object names in FETCH_HEAD 2011-11-04 21:40:25 -07:00
fetch.br-unconfig_config-glob fetch: do not store peeled tag object names in FETCH_HEAD 2011-11-04 21:40:25 -07:00
fetch.br-unconfig_remote-explicit fetch: do not store peeled tag object names in FETCH_HEAD 2011-11-04 21:40:25 -07:00
fetch.br-unconfig_remote-glob fetch: do not store peeled tag object names in FETCH_HEAD 2011-11-04 21:40:25 -07:00
fetch.master fetch: do not store peeled tag object names in FETCH_HEAD 2011-11-04 21:40:25 -07:00
fetch.master_--tags_.._.git fetch: do not store peeled tag object names in FETCH_HEAD 2011-11-04 21:40:25 -07:00
fetch.master_.._.git t/t5515-fetch-merge-logic.sh: Add two more tests 2007-03-07 10:22:44 -08:00
fetch.master_.._.git_one
fetch.master_.._.git_one_tag_tag-one_tag_tag-three-file fetch: do not store peeled tag object names in FETCH_HEAD 2011-11-04 21:40:25 -07:00
fetch.master_.._.git_one_two
fetch.master_.._.git_tag_tag-one-tree_tag_tag-three-file fetch: do not store peeled tag object names in FETCH_HEAD 2011-11-04 21:40:25 -07:00
fetch.master_.._.git_tag_tag-one_tag_tag-three fetch: do not store peeled tag object names in FETCH_HEAD 2011-11-04 21:40:25 -07:00
fetch.master_branches-default fetch: do not store peeled tag object names in FETCH_HEAD 2011-11-04 21:40:25 -07:00
fetch.master_branches-one fetch: do not store peeled tag object names in FETCH_HEAD 2011-11-04 21:40:25 -07:00
fetch.master_config-explicit fetch: do not store peeled tag object names in FETCH_HEAD 2011-11-04 21:40:25 -07:00
fetch.master_config-glob fetch: do not store peeled tag object names in FETCH_HEAD 2011-11-04 21:40:25 -07:00
fetch.master_remote-explicit fetch: do not store peeled tag object names in FETCH_HEAD 2011-11-04 21:40:25 -07:00
fetch.master_remote-glob fetch: do not store peeled tag object names in FETCH_HEAD 2011-11-04 21:40:25 -07:00
refs.br-branches-default git-fetch test: test tracking fetch results, not just FETCH_HEAD 2008-03-26 01:29:54 -07:00
refs.br-branches-default-merge git-fetch test: test tracking fetch results, not just FETCH_HEAD 2008-03-26 01:29:54 -07:00
refs.br-branches-default-merge_branches-default git-fetch test: test tracking fetch results, not just FETCH_HEAD 2008-03-26 01:29:54 -07:00
refs.br-branches-default-octopus git-fetch test: test tracking fetch results, not just FETCH_HEAD 2008-03-26 01:29:54 -07:00
refs.br-branches-default-octopus_branches-default git-fetch test: test tracking fetch results, not just FETCH_HEAD 2008-03-26 01:29:54 -07:00
refs.br-branches-default_branches-default git-fetch test: test tracking fetch results, not just FETCH_HEAD 2008-03-26 01:29:54 -07:00
refs.br-branches-one git-fetch test: test tracking fetch results, not just FETCH_HEAD 2008-03-26 01:29:54 -07:00
refs.br-branches-one-merge git-fetch test: test tracking fetch results, not just FETCH_HEAD 2008-03-26 01:29:54 -07:00
refs.br-branches-one-merge_branches-one git-fetch test: test tracking fetch results, not just FETCH_HEAD 2008-03-26 01:29:54 -07:00
refs.br-branches-one-octopus git-fetch test: test tracking fetch results, not just FETCH_HEAD 2008-03-26 01:29:54 -07:00
refs.br-branches-one-octopus_branches-one git-fetch test: test tracking fetch results, not just FETCH_HEAD 2008-03-26 01:29:54 -07:00
refs.br-branches-one_branches-one git-fetch test: test tracking fetch results, not just FETCH_HEAD 2008-03-26 01:29:54 -07:00
refs.br-config-explicit git-fetch test: test tracking fetch results, not just FETCH_HEAD 2008-03-26 01:29:54 -07:00
refs.br-config-explicit-merge git-fetch test: test tracking fetch results, not just FETCH_HEAD 2008-03-26 01:29:54 -07:00
refs.br-config-explicit-merge_config-explicit git-fetch test: test tracking fetch results, not just FETCH_HEAD 2008-03-26 01:29:54 -07:00
refs.br-config-explicit-octopus git-fetch test: test tracking fetch results, not just FETCH_HEAD 2008-03-26 01:29:54 -07:00
refs.br-config-explicit-octopus_config-explicit git-fetch test: test tracking fetch results, not just FETCH_HEAD 2008-03-26 01:29:54 -07:00
refs.br-config-explicit_config-explicit git-fetch test: test tracking fetch results, not just FETCH_HEAD 2008-03-26 01:29:54 -07:00
refs.br-config-glob git-fetch test: test tracking fetch results, not just FETCH_HEAD 2008-03-26 01:29:54 -07:00
refs.br-config-glob-merge git-fetch test: test tracking fetch results, not just FETCH_HEAD 2008-03-26 01:29:54 -07:00
refs.br-config-glob-merge_config-glob git-fetch test: test tracking fetch results, not just FETCH_HEAD 2008-03-26 01:29:54 -07:00
refs.br-config-glob-octopus git-fetch test: test tracking fetch results, not just FETCH_HEAD 2008-03-26 01:29:54 -07:00
refs.br-config-glob-octopus_config-glob git-fetch test: test tracking fetch results, not just FETCH_HEAD 2008-03-26 01:29:54 -07:00
refs.br-config-glob_config-glob git-fetch test: test tracking fetch results, not just FETCH_HEAD 2008-03-26 01:29:54 -07:00
refs.br-remote-explicit git-fetch test: test tracking fetch results, not just FETCH_HEAD 2008-03-26 01:29:54 -07:00
refs.br-remote-explicit-merge git-fetch test: test tracking fetch results, not just FETCH_HEAD 2008-03-26 01:29:54 -07:00
refs.br-remote-explicit-merge_remote-explicit git-fetch test: test tracking fetch results, not just FETCH_HEAD 2008-03-26 01:29:54 -07:00
refs.br-remote-explicit-octopus git-fetch test: test tracking fetch results, not just FETCH_HEAD 2008-03-26 01:29:54 -07:00
refs.br-remote-explicit-octopus_remote-explicit git-fetch test: test tracking fetch results, not just FETCH_HEAD 2008-03-26 01:29:54 -07:00
refs.br-remote-explicit_remote-explicit git-fetch test: test tracking fetch results, not just FETCH_HEAD 2008-03-26 01:29:54 -07:00
refs.br-remote-glob git-fetch test: test tracking fetch results, not just FETCH_HEAD 2008-03-26 01:29:54 -07:00
refs.br-remote-glob-merge git-fetch test: test tracking fetch results, not just FETCH_HEAD 2008-03-26 01:29:54 -07:00
refs.br-remote-glob-merge_remote-glob git-fetch test: test tracking fetch results, not just FETCH_HEAD 2008-03-26 01:29:54 -07:00
refs.br-remote-glob-octopus git-fetch test: test tracking fetch results, not just FETCH_HEAD 2008-03-26 01:29:54 -07:00
refs.br-remote-glob-octopus_remote-glob git-fetch test: test tracking fetch results, not just FETCH_HEAD 2008-03-26 01:29:54 -07:00
refs.br-remote-glob_remote-glob git-fetch test: test tracking fetch results, not just FETCH_HEAD 2008-03-26 01:29:54 -07:00
refs.br-unconfig git-fetch test: test tracking fetch results, not just FETCH_HEAD 2008-03-26 01:29:54 -07:00
refs.br-unconfig_--tags_.._.git git-fetch test: test tracking fetch results, not just FETCH_HEAD 2008-03-26 01:29:54 -07:00
refs.br-unconfig_.._.git git-fetch test: test tracking fetch results, not just FETCH_HEAD 2008-03-26 01:29:54 -07:00
refs.br-unconfig_.._.git_one git-fetch test: test tracking fetch results, not just FETCH_HEAD 2008-03-26 01:29:54 -07:00
refs.br-unconfig_.._.git_one_tag_tag-one_tag_tag-three-file git-fetch test: test tracking fetch results, not just FETCH_HEAD 2008-03-26 01:29:54 -07:00
refs.br-unconfig_.._.git_one_two git-fetch test: test tracking fetch results, not just FETCH_HEAD 2008-03-26 01:29:54 -07:00
refs.br-unconfig_.._.git_tag_tag-one-tree_tag_tag-three-file git-fetch test: test tracking fetch results, not just FETCH_HEAD 2008-03-26 01:29:54 -07:00
refs.br-unconfig_.._.git_tag_tag-one_tag_tag-three git-fetch test: test tracking fetch results, not just FETCH_HEAD 2008-03-26 01:29:54 -07:00
refs.br-unconfig_branches-default git-fetch test: test tracking fetch results, not just FETCH_HEAD 2008-03-26 01:29:54 -07:00
refs.br-unconfig_branches-one git-fetch test: test tracking fetch results, not just FETCH_HEAD 2008-03-26 01:29:54 -07:00
refs.br-unconfig_config-explicit git-fetch test: test tracking fetch results, not just FETCH_HEAD 2008-03-26 01:29:54 -07:00
refs.br-unconfig_config-glob git-fetch test: test tracking fetch results, not just FETCH_HEAD 2008-03-26 01:29:54 -07:00
refs.br-unconfig_remote-explicit git-fetch test: test tracking fetch results, not just FETCH_HEAD 2008-03-26 01:29:54 -07:00
refs.br-unconfig_remote-glob git-fetch test: test tracking fetch results, not just FETCH_HEAD 2008-03-26 01:29:54 -07:00
refs.master git-fetch test: test tracking fetch results, not just FETCH_HEAD 2008-03-26 01:29:54 -07:00
refs.master_--tags_.._.git git-fetch test: test tracking fetch results, not just FETCH_HEAD 2008-03-26 01:29:54 -07:00
refs.master_.._.git git-fetch test: test tracking fetch results, not just FETCH_HEAD 2008-03-26 01:29:54 -07:00
refs.master_.._.git_one git-fetch test: test tracking fetch results, not just FETCH_HEAD 2008-03-26 01:29:54 -07:00
refs.master_.._.git_one_tag_tag-one_tag_tag-three-file git-fetch test: test tracking fetch results, not just FETCH_HEAD 2008-03-26 01:29:54 -07:00
refs.master_.._.git_one_two git-fetch test: test tracking fetch results, not just FETCH_HEAD 2008-03-26 01:29:54 -07:00
refs.master_.._.git_tag_tag-one-tree_tag_tag-three-file git-fetch test: test tracking fetch results, not just FETCH_HEAD 2008-03-26 01:29:54 -07:00
refs.master_.._.git_tag_tag-one_tag_tag-three git-fetch test: test tracking fetch results, not just FETCH_HEAD 2008-03-26 01:29:54 -07:00
refs.master_branches-default git-fetch test: test tracking fetch results, not just FETCH_HEAD 2008-03-26 01:29:54 -07:00
refs.master_branches-one git-fetch test: test tracking fetch results, not just FETCH_HEAD 2008-03-26 01:29:54 -07:00
refs.master_config-explicit git-fetch test: test tracking fetch results, not just FETCH_HEAD 2008-03-26 01:29:54 -07:00
refs.master_config-glob git-fetch test: test tracking fetch results, not just FETCH_HEAD 2008-03-26 01:29:54 -07:00
refs.master_remote-explicit git-fetch test: test tracking fetch results, not just FETCH_HEAD 2008-03-26 01:29:54 -07:00
refs.master_remote-glob git-fetch test: test tracking fetch results, not just FETCH_HEAD 2008-03-26 01:29:54 -07:00