X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-reset.sh;h=f9995cadf563a7b3b2c1dcdeea3bf862feac2e4b;hb=b5c367f75c2990650119749a1add5216871ca47a;hp=e028ff65dba75699580d47fbbe3fa6825774af83;hpb=e8623d45b42f4d379c6258a34ebf96fe840b195c;p=git.git diff --git a/git-reset.sh b/git-reset.sh index e028ff65..f9995cad 100755 --- a/git-reset.sh +++ b/git-reset.sh @@ -60,7 +60,7 @@ then else rm -f "$GIT_DIR/ORIG_HEAD" fi -echo "$rev" >"$GIT_DIR/HEAD" +git-update-ref HEAD "$rev" case "$reset_type" in --hard ) @@ -81,10 +81,12 @@ case "$reset_type" in while (<$fh>) { chomp; if (! exists $keep{$_}) { - print "$_\0"; + # it is ok if this fails -- it may already + # have been culled by checkout-index. + unlink $_; } } - ' $tmp-exists | xargs -0 rm -f -- + ' $tmp-exists ;; --soft ) ;; # Nothing else to do