Staging
v0.5.1
v0.5.1
https://github.com/git/git
Revision 0556a11a0df6b4119e01aa77dfb795561e62eb34 authored by Linus Torvalds on 30 June 2006, 18:20:33 UTC, committed by Junio C Hamano on 02 July 2006, 01:28:15 UTC
This IMNSHO cleans up the object hashing. The hash expansion is separated out into a function of its own, the hash array (and size) names are made more obvious, and the code is generally made to look a bit more like the object-ref hashing. It also gets rid of "find_object()" returning an index (or negative position if no object is found), since that is made redundant by the simplified object rehashing. The basic operation is now "lookup_object()" which just returns the object itself. There's an almost unmeasurable speed increase, but more importantly, I think the end result is more readable. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
1 parent 6631c73
Tip revision: 0556a11a0df6b4119e01aa77dfb795561e62eb34 authored by Linus Torvalds on 30 June 2006, 18:20:33 UTC
git object hash cleanups
git object hash cleanups
Tip revision: 0556a11
git-reset.sh
#!/bin/sh
USAGE='[--mixed | --soft | --hard] [<commit-ish>]'
. git-sh-setup
tmp=${GIT_DIR}/reset.$$
trap 'rm -f $tmp-*' 0 1 2 3 15
update=
reset_type=--mixed
case "$1" in
--mixed | --soft | --hard)
reset_type="$1"
shift
;;
-*)
usage ;;
esac
rev=$(git-rev-parse --verify --default HEAD "$@") || exit
rev=$(git-rev-parse --verify $rev^0) || exit
# We need to remember the set of paths that _could_ be left
# behind before a hard reset, so that we can remove them.
if test "$reset_type" = "--hard"
then
update=-u
fi
# Soft reset does not touch the index file nor the working tree
# at all, but requires them in a good order. Other resets reset
# the index file to the tree object we are switching to.
if test "$reset_type" = "--soft"
then
if test -f "$GIT_DIR/MERGE_HEAD" ||
test "" != "$(git-ls-files --unmerged)"
then
die "Cannot do a soft reset in the middle of a merge."
fi
else
git-read-tree --reset $update "$rev" || exit
fi
# Any resets update HEAD to the head being switched to.
if orig=$(git-rev-parse --verify HEAD 2>/dev/null)
then
echo "$orig" >"$GIT_DIR/ORIG_HEAD"
else
rm -f "$GIT_DIR/ORIG_HEAD"
fi
git-update-ref -m "reset $reset_type $@" HEAD "$rev"
case "$reset_type" in
--hard )
;; # Nothing else to do
--soft )
;; # Nothing else to do
--mixed )
# Report what has not been updated.
git-update-index --refresh
;;
esac
rm -f "$GIT_DIR/MERGE_HEAD" "$GIT_DIR/rr-cache/MERGE_RR" "$GIT_DIR/SQUASH_MSG"
Computing file changes ...