Re: [PATCH] rebase -i: move help to end of todo file
- From
Johannes Schindelin <johannes.schindelin@gmx.de>
- Date
- Nov 22, 2007, 12:30 UTC
- Message-ID
- <Pine.LNX.4.64.0711221225570.27959@racer.site>
- In-Reply-To
- <7vbq9m5wpa.fsf@gitster.siamese.dyndns.org>
Hi,
On Thu, 22 Nov 2007, Junio C Hamano wrote:
Show 8 quoted lines
> Johannes Schindelin <Johannes.Schindelin@gmx.de> writes: > > > How about this? I am hesitant to remove _everything_, since quite > > a few people seem to be allergic to man pages, so they fire up > > rebase -i without any clue. > > Oh, I wouldn't dream of suggesting complete removal of the help > text,
I meant to "move" everything. Sorry.
> but leaving the single line at the beginning is not an improvement. > What's on that single line is not particularly useful but that is a > separate issue.
Okay, so you'd like this better?
-- snipsnap -- [PATCH] rebase -i: move help to end of todo file
Many editors start in the first line, so the 9-line help text was an annoyance. So move it to the end.
Requested by Junio.
While at it, add a hint how to abort the rebase.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> --- git-rebase--interactive.sh | 14 ++++++++------ t/t3404-rebase-interactive.sh | 3 ++- 2 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index a6dc72a..58fde89 100755 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -479,8 +479,13 @@ do SHORTUPSTREAM=$(git rev-parse --short $UPSTREAM) SHORTHEAD=$(git rev-parse --short $HEAD) SHORTONTO=$(git rev-parse --short $ONTO) - cat > "$TODO" << EOF -# Rebasing $SHORTUPSTREAM..$SHORTHEAD onto $SHORTONTO + git rev-list $MERGES_OPTION --pretty=oneline --abbrev-commit \ + --abbrev=7 --reverse --left-right --cherry-pick \ + $UPSTREAM...$HEAD | \ + sed -n "s/^>/pick /p" > "$TODO" + cat >> "$TODO" << EOF + +# Rebase $SHORTUPSTREAM..$SHORTHEAD onto $SHORTONTO # # Commands: # pick = use commit @@ -488,12 +493,9 @@ do # squash = use commit, but meld into previous commit # # If you remove a line here THAT COMMIT WILL BE LOST. +# However, if you remove everything, the rebase will be aborted. # EOF - git rev-list $MERGES_OPTION --pretty=oneline --abbrev-commit \ - --abbrev=7 --reverse --left-right --cherry-pick \ - $UPSTREAM...$HEAD | \ - sed -n "s/^>/pick /p" >> "$TODO" has_action "$TODO" || die_abort "Nothing to do" diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh index f1039d1..907c7f9 100755 --- a/t/t3404-rebase-interactive.sh +++ b/t/t3404-rebase-interactive.sh @@ -149,7 +149,8 @@ test_expect_success 'stop on conflicting pick' ' diff -u expect .git/.dotest-merge/patch && diff -u expect2 file1 && test 4 = $(grep -v "^#" < .git/.dotest-merge/done | wc -l) && - test 0 = $(grep -v "^#" < .git/.dotest-merge/git-rebase-todo | wc -l) + test 0 = $(grep -ve "^#" -e "^$" < .git/.dotest-merge/git-rebase-todo | + wc -l) ' test_expect_success 'abort' '
-- 1.5.3.6.1977.g54d30