X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-checkout.sh;h=d561c88dcbd3d5a67b4b6725e00683e613d80b9b;hb=e1944f4074f845e4dd15fb77856b4463f51c7d81;hp=6b6facfd5a224afca735d4693d304726f4032e6f;hpb=e97593693ed36da918413732c9ca4b09c3e9d213;p=git.git diff --git a/git-checkout.sh b/git-checkout.sh index 6b6facfd5..d561c88dc 100755 --- a/git-checkout.sh +++ b/git-checkout.sh @@ -210,7 +210,7 @@ else esac # Match the index to the working tree, and do a three-way. - git diff-files --name-only | git update-index --remove --stdin && + git diff-files --name-only | git update-index --remove --stdin && work=`git write-tree` && git read-tree $v --reset -u $new || exit @@ -245,7 +245,7 @@ else (exit $saved_err) fi -# +# # Switch the HEAD pointer to the new branch if we # checked out a branch head, and remove any potential # old MERGE_HEAD's (subsequent commits will clearly not