git-reset: detect update-ref error and report it.
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
parent
5f468c4805
commit
dee4e384f3
@ -52,7 +52,8 @@ then
|
|||||||
else
|
else
|
||||||
rm -f "$GIT_DIR/ORIG_HEAD"
|
rm -f "$GIT_DIR/ORIG_HEAD"
|
||||||
fi
|
fi
|
||||||
git-update-ref -m "reset $reset_type $@" HEAD "$rev"
|
git-update-ref -m "reset $reset_type $*" HEAD "$rev"
|
||||||
|
update_ref_status=$?
|
||||||
|
|
||||||
case "$reset_type" in
|
case "$reset_type" in
|
||||||
--hard )
|
--hard )
|
||||||
@ -66,3 +67,5 @@ case "$reset_type" in
|
|||||||
esac
|
esac
|
||||||
|
|
||||||
rm -f "$GIT_DIR/MERGE_HEAD" "$GIT_DIR/rr-cache/MERGE_RR" "$GIT_DIR/SQUASH_MSG"
|
rm -f "$GIT_DIR/MERGE_HEAD" "$GIT_DIR/rr-cache/MERGE_RR" "$GIT_DIR/SQUASH_MSG"
|
||||||
|
|
||||||
|
exit $update_ref_status
|
||||||
|
Loading…
Reference in New Issue
Block a user