Thread (9 messages) flat view 9 messages, 2 authors, 2016-06-15

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

From: Johannes Schindelin <hidden>
Date: 2016-06-15 22:43:20

Hi,

On Sun, 8 Jul 2007, Johannes Schindelin wrote:
quoted hunk ↗ jump to hunk
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
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help