diff options
| author |  Jeff King <peff@peff.net> | 2011-03-25 14:13:31 -0400 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2011-04-03 12:35:39 -0700 |
| commit | 8c8674fc954d8c4bc46f303a141f510ecf264fcd (patch) | |
| tree | 7051d86def82068ed533d8d8209289e91aaed9d4 | |
| parent | Merge branch 'jc/index-update-if-able' into maint (diff) | |
| download | tgif-8c8674fc954d8c4bc46f303a141f510ecf264fcd.tar.xz | |
pull: do not clobber untracked files on initial pull
For a pull into an unborn branch, we do not use "git merge"
at all. Instead, we call read-tree directly. However, we
used the --reset parameter instead of "-m", which turns off
the safety features.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | git-pull.sh | 2 | ||||
| -rwxr-xr-x | t/t5520-pull.sh | 11 |
2 files changed, 12 insertions, 1 deletions
diff --git a/git-pull.sh b/git-pull.sh index f6b7b84048..c98c0fc32e 100755 --- a/git-pull.sh +++ b/git-pull.sh @@ -272,7 +272,7 @@ esac if test -z "$orig_head" then git update-ref -m "initial pull" HEAD $merge_head "$curr_head" && - git read-tree --reset -u HEAD || exit 1 + git read-tree -m -u HEAD || exit 1 exit fi diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh index 0470a81be0..0e5eb678ce 100755 --- a/t/t5520-pull.sh +++ b/t/t5520-pull.sh @@ -46,6 +46,17 @@ test_expect_success 'pulling into void using master:master' ' test_cmp file cloned-uho/file ' +test_expect_success 'pulling into void does not overwrite untracked files' ' + git init cloned-untracked && + ( + cd cloned-untracked && + echo untracked >file && + test_must_fail git pull .. master && + echo untracked >expect && + test_cmp expect file + ) +' + test_expect_success 'test . as a remote' ' git branch copy master && |