undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rebase -i: remember the settings of -v, -s and -p when interrupted

Browse Source 
After interruption, be that an edit, or a conflicting commit, reset
the variables VERBOSE, STRATEGY and PRESERVE_MERGES, so that the
user does not have to respecify them with "rebase --continue".

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Johannes Schindelin 2007-07-08 03:02:47 +01:00 committed by Junio C Hamano
parent 3df0a859aa
commit 8e4a91bd78
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
git-rebase--interactive.sh
View File

@ -23,6 +23,9 @@ REWRITTEN="$DOTEST"/rewritten
PRESERVE_MERGES= PRESERVE_MERGES=
STRATEGY= STRATEGY=
VERBOSE= VERBOSE=
test -d "$REWRITTEN" && PRESERVE_MERGES=t
test -f "$DOTEST"/strategy && STRATEGY="$(cat "$DOTEST"/strategy)"
test -f "$DOTEST"/verbose && VERBOSE=t
warn () { warn () {
echo "$*" >&2 echo "$*" >&2
@ -366,6 +369,7 @@ do
echo $HEAD > "$DOTEST"/head echo $HEAD > "$DOTEST"/head
echo $UPSTREAM > "$DOTEST"/upstream echo $UPSTREAM > "$DOTEST"/upstream
echo $ONTO > "$DOTEST"/onto echo $ONTO > "$DOTEST"/onto
test -z "$STRATEGY" || echo "$STRATEGY" > "$DOTEST"/strategy
test t = "$VERBOSE" && : > "$DOTEST"/verbose test t = "$VERBOSE" && : > "$DOTEST"/verbose
if [ t = "$PRESERVE_MERGES" ] if [ t = "$PRESERVE_MERGES" ]
then then

10
t/t3404-rebase-interactive.sh
View File

@ -202,4 +202,14 @@ test_expect_success '--continue tries to commit' '
git show HEAD | grep chouette git show HEAD | grep chouette
' '
test_expect_success 'verbose flag is heeded, even after --continue' '
git reset --hard HEAD@{1} &&
test_tick &&
! git rebase -v -i --onto new-branch1 HEAD^ &&
echo resolved > file1 &&
git add file1 &&
git rebase --continue > output &&
grep "^ file1 | 2 +-$" output
'
test_done test_done