[PATCH] git-reset: make the output as the fetch output

[PATCH] git-reset: make the output as the fetch output

[Santi Béjar]

... and only when HEAD is changed.

Signed-off-by: Santi Béjar <sbejar@gmail.com>
---
 git-reset.sh |   19 +++++++++++++------
 1 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/git-reset.sh b/git-reset.sh
index bf2a058..acefddc 100755
--- a/git-reset.sh
+++ b/git-reset.sh
@@ -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

Re: [PATCH] git-reset: make the output as the fetch output

[Santi Béjar]

Hi *,

> @@ -84,14 +85,20 @@ fi
[...]
> +    echo "* HEAD: reset to $commit"
[...]

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

Santi

Re: [PATCH] git-reset: make the output as the fetch output

[YOSHIFUJI Hideaki / 吉藤英明]

In article <8aa486160701170527p69c59510i2daf99e7e805ec5a@mail.gmail.com> (at Wed, 17 Jan 2007 14:27:15 +0100), "Santi Béjar" <sbejar@gmail.com> says:

> > @@ -84,14 +85,20 @@ fi
> [...]
> > +    echo "* HEAD: reset to $commit"
> [...]
> 
> perhaps?
> echo "* HEAD: resetted to $commit"

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

--yoshfuji

Re: [PATCH] git-reset: make the output as the fetch output

[Andy Parkins]

On Wednesday 2007 January 17 13:27, Santi Béjar wrote:

> > +    echo "* HEAD: reset to $commit"
>
> [...]
>
> perhaps?
> echo "* HEAD: resetted to $commit"

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
andyparkins@gmail.com

Re: [PATCH] git-reset: make the output as the fetch output

[Johannes Schindelin]

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

Re: [PATCH] git-reset: make the output as the fetch output

[Johannes Schindelin]

[-- Attachment #1: Type: TEXT/PLAIN, Size: 815 bytes --]

Hi,

[reCc'ing list]

On Wed, 17 Jan 2007, Santi Béjar wrote:

> On 1/17/07, Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:
> > 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.
> 
> My motivation is to have a coherent output. I recognize that the ..
> notation in fetch (fastforwarding) does not generally make sense in
> reset. Could be better
> 
> * HEAD: reset to ...
>  old: $hash
>  new: $hash
> 
> If I want to see the commit title I do a "git branch -v".

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

Ciao,
Dscho