diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-06-28 22:47:28 +0400 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-06-29 06:30:51 +0400 |
| commit | abc02670169cee9541793a86324a014272ca8ed5 (patch) | |
| tree | cbfdc59d57f0a22cd2c43b2baf3d0b6315b4e965 /git-checkout.sh | |
| parent | 8f4a9b62ee16eb018a9d3a675563115e14708953 (diff) | |
checkout -m: fix read-tree invocationv1.4.1-rc2
When we updated "read-tree -m -u" to be careful about not
removing untracked working tree files, we broke "checkout -m" to
switch between branches.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-checkout.sh')
| -rwxr-xr-x | git-checkout.sh | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/git-checkout.sh b/git-checkout.sh index 77c2593809..5613bfc403 100755 --- a/git-checkout.sh +++ b/git-checkout.sh @@ -150,8 +150,7 @@ else # Match the index to the working tree, and do a three-way. git diff-files --name-only | git update-index --remove --stdin && work=`git write-tree` && - git read-tree --reset $new && - git checkout-index -f -u -q -a && + git read-tree --reset -u $new && git read-tree -m -u --aggressive $old $new $work || exit if result=`git write-tree 2>/dev/null` |