Re: [PATCH 1/3] rebase -i: handle --continue more like non-interactive rebase
- From
Johannes Schindelin <johannes.schindelin@gmx.de>
- Date
- Jul 8, 2007, 04:40 UTC
- Message-ID
- <Pine.LNX.4.64.0707080537490.4093@racer.site>
- In-Reply-To
- <Pine.LNX.4.64.0707080300440.4093@racer.site>
Hi,
On Sun, 8 Jul 2007, Johannes Schindelin wrote:
Show 19 quoted lines
> 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