git commit broken ?

git commit broken ?

[Franck Bui-Huu]

It seems that "git commit -a -c ORIG_HEAD" command do not work as
expected.

Here is an example:

	$ ls
	a b c

	$ git status
	nothing to commit

	$ echo "good modif" > a
	$ echo "temp modif" > c
	$ git-update-index a
	$ git commit -m "work in prog"

	$ git reset --soft HEAD^
	$ git status
	#
	# Updated but not checked in:
	#   (will commit)
	#
	#       modified: a
	#
	#
	# Changed but not updated:
	#   (use git-update-index to mark for commit)
	#
	#       modified: c
	#
	
	$ git commit -a -c ORIG_HEAD
	$ git status
	nothing to commit

So it seems that c has been commmited this time...Is it the expected
behaviour ?

My git version:

	$ git --version
	git version 1.3.0.rc3.g0ed4

Thanks
--
               Franck

Re: git commit broken ?

[Junio C Hamano]

"Franck Bui-Huu" <vagabon.xyz@gmail.com> writes:

> It seems that "git commit -a -c ORIG_HEAD" command do not work as
> expected.
>
> 	$ git commit -a -c ORIG_HEAD
> 	$ git status
> 	nothing to commit
>
> So it seems that c has been commmited this time...Is it the expected
> behaviour ?

You said "git commit -a" to tell it to commit all your changes
in your working tree, using "-c ORIG_HEAD" which means "take the
commit log message and authorship information from that commit".

So I do not understand what else, other than both a and c
getting committed (hence subsequent "git status" to report
"nothing to commit'), you are expecting...

Re: git commit broken ?

[Franck Bui-Huu]

2006/4/10, Junio C Hamano <junkio@cox.net>:
> "Franck Bui-Huu" <vagabon.xyz@gmail.com> writes:
>
> > It seems that "git commit -a -c ORIG_HEAD" command do not work as
> > expected.
> >
> >       $ git commit -a -c ORIG_HEAD
> >       $ git status
> >       nothing to commit
> >
> > So it seems that c has been commmited this time...Is it the expected
> > behaviour ?
>
> You said "git commit -a" to tell it to commit all your changes
> in your working tree, using "-c ORIG_HEAD" which means "take the
> commit log message and authorship information from that commit".
>
> So I do not understand what else, other than both a and c
> getting committed (hence subsequent "git status" to report
> "nothing to commit'), you are expecting...

oops, I forgot that switch, sorry for the noise.

Thanks
--
               Franck