git-reset: make the output as the fetch output

... and only when HEAD is changed.

---
 git-reset.sh |   19 +++++++++++++------
 1 files changed, 13 insertions(+), 6 deletions(-)

index bf2a058..acefddc 100755
@@ -24,6 +24,7 @@ do
 		usage
 		;;
 	*)
+		commit="$1"
 		rev=$(git-rev-parse --verify "$1") || exit
 		shift
 		break

@@ -84,14 +85,20 @@ fi
 git-update-ref -m "$GIT_REFLOG_ACTION" HEAD "$rev"
 update_ref_status=$?
 
+if test $update_ref_status = 0 && test "$orig" != "$rev"
+then
+    revshort=$(git-rev-parse --short $rev)
+    echo "* HEAD: reset to $commit"
+    if test "$orig" ; then
+	echo "  old..new: $(git-rev-parse --short $orig)..$revshort"
+    else
+	echo "  commit: $revshort"
+    fi
+fi
+
 case "$reset_type" in
 --hard )
-	test $update_ref_status = 0 && {
-		printf "HEAD is now at "
-		GIT_PAGER= git log --max-count=1 --pretty=oneline \
-			--abbrev-commit HEAD
-	}
-	;;
+	;; # Nothing else to do
 --soft )
 	;; # Nothing else to do
 --mixed )

1.5.0.rc1.g0dee5

Hi *,

[...]

[...]

perhaps?
echo "* HEAD: resetted to $commit"

Santi

In article <[email protected]> (at Wed, 17 Jan 2007 14:27:15 +0100), "Santi Béjar" <[email protected]> says:

Of course, not. Past (and past participle) of "reset" is "reset".

--yoshfuji

You were right the first time; "reset" is the correct past-tense form. If anything, I'd lose the colon...

HEAD reset to $commit

is a perfectly acceptable sentence.

Andy

Dr Andy Parkins, M Eng (hons), MIEE
[email protected]

Hi,

IMHO your version is less helpful than the current behaviour: now it shows the oneline (which your version doesn't), and in most cases you reset from a dirty state (at least I _exclusively_ use reset in such situations), where "from..to" does not make any sense.

Ciao,
Dscho

Hi,

[reCc'ing list]

The whole point of tags/v1.5.0-rc0~44 was to _avoid_ "git branch -v", or "git show HEAD".

Ciao,
Dscho