From 8c8674fc954d8c4bc46f303a141f510ecf264fcd Mon Sep 17 00:00:00 2001 From: Jeff King Date: Fri, 25 Mar 2011 14:13:31 -0400 Subject: 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 Signed-off-by: Junio C Hamano --- git-pull.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'git-pull.sh') 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 -- cgit v1.3