Re: [PATCH 1/3] rebase -i: handle --continue more like non-interactive rebase

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hi,

On Sun, 8 Jul 2007, Johannes Schindelin wrote:

> diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
> index 0c2a969..67f2ee2 100755
> --- a/git-rebase--interactive.sh
> +++ b/git-rebase--interactive.sh
>
> [...]
>
> @@ -265,6 +264,14 @@ do
>  
>  		test -d "$DOTEST" || die "No interactive rebase running"
>  
> +		# commit if necessary
> +		git rev-parse --verify HEAD > /dev/null &&
> +		git update-index --refresh &&
> +		git diff-files --quiet &&
> +		! git diff-index --cached --quiet HEAD &&
> +		. "$DOTEST"/author-script &&
> +		git commit -F "$DOTEST"/message -e
> +

Oh well. For this to work, there has to be a line

		export GIT_AUTHOR_NAME GIT_AUTHOR_NAME GIT_AUTHOR_DATE &&

before the "git commit" line, I think.

Ciao,
Dscho

-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux