Skip to main content

Browse the archive

Staging
v0.5.1
Revision 49ed2bc4660c7cd0592cf21cc514080574d06320 authored by Junio C Hamano on 05 December 2006, 03:44:40 UTC, committed by Junio C Hamano on 06 December 2006, 18:47:14 UTC 
git-reset to remove "$GIT_DIR/MERGE_MSG"
 
An earlier commit a9cb3c6e changed git-commit to use the
contents of MERGE_MSG even when we do not have MERGE_HEAD (the
rationale is in its log message).

However, the change tricks the following sequence to include a
merge message in a completely unrelated commit:

	$ git pull somewhere
	: oops, the conflicts are too much.  forget it.
        $ git reset --hard
        : work work work
        $ git commit

To fix this confusion, this patch makes "git reset" to remove
the leftover MERGE_MSG that was prepared when the user abandoned
the merge.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Acked-by: Luben Tuikov <ltuikov@yahoo.com
1 parent 0fb1eaa
Raw File
GIT-VERSION-GEN 
#!/bin/sh

GVF=GIT-VERSION-FILE
DEF_VER=v1.4.4.1.GIT

LF='
'

# First try git-describe, then see if there is a version file
# (included in release tarballs), then default
if VN=$(git describe --abbrev=4 HEAD 2>/dev/null) &&
   case "$VN" in
   *$LF*) (exit 1) ;;
   v[0-9]*) : happy ;;
   esac
then
	VN=$(echo "$VN" | sed -e 's/-/./g');
elif test -f version
then
	VN=$(cat version) || VN="$DEF_VER"
else
	VN="$DEF_VER"
fi

VN=$(expr "$VN" : v*'\(.*\)')

dirty=$(sh -c 'git diff-index --name-only HEAD' 2>/dev/null) || dirty=
case "$dirty" in
'')
	;;
*)
	VN="$VN-dirty" ;;
esac

if test -r $GVF
then
	VC=$(sed -e 's/^GIT_VERSION = //' <$GVF)
else
	VC=unset
fi
test "$VN" = "$VC" || {
	echo >&2 "GIT_VERSION = $VN"
	echo "GIT_VERSION = $VN" >$GVF
}
back to top