[PATCH 4/4] pull: do not clobber untracked files on initial pull
- From
Jeff King <peff@peff.net>
- Date
- Mar 25, 2011, 18:13 UTC
- Message-ID
- <20110325181331.GD14898@sigill.intra.peff.net>
- In-Reply-To
- <20110325180644.GA30838@sigill.intra.peff.net>
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> --- This blames all the way back to d09e79c (git-pull: allow pulling into an empty repository, 2006-11-16) by Linus. I couldn't think of a good reason to use "--reset" instead of "-m".
git-pull.sh | 2 +- t/t5520-pull.sh | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/git-pull.sh b/git-pull.sh index 63b063a..e31226b 100755 --- a/git-pull.sh +++ b/git-pull.sh @@ -274,7 +274,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 0470a81..0e5eb67 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 &&
-- 1.7.4.33.gb8855.dirty