From: Ralf Thielow <ralf.thielow@gmail.com>
To: git@vger.kernel.org
Cc: bafain@gmail.com, campos@esss.com.br, mhagger@alum.mit.edu,
sunshine@sunshineco.com, Ralf Thielow <ralf.thielow@gmail.com>
Subject: [PATCH] rebase -i: remember merge options beyond continue actions
Date: Fri, 11 Dec 2015 20:54:06 +0100 [thread overview]
Message-ID: <1449863646-26067-1-git-send-email-ralf.thielow@gmail.com> (raw)
In-Reply-To: <53965334.3030206@gmail.com>
From: Fabian Ruch <bafain@gmail.com>
If the user specifies a merge strategy or strategy options in
"rebase --interactive", also use these in subsequent calls of
"rebase --continue".
In the implementation, the "do_merge" guard to check for a given
merge strategy or strategy options is implied by passing these
options, but not stored. This prevents subsequent calls of
"rebase --continue" to use this setting again later. Remove this
"do_merge" guard to allow a later usage.
Reported-by: Diogo de Campos <campos@esss.com.br>
Signed-off-by: Fabian Ruch <bafain@gmail.com>
Helped-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
---
I've been applying the original patch for a long time to my tree,
as it helps me to resolve conflicts e.g. when rebasing .po files.
I also think it's a reasonable change for git-rebase.
I've rebased it agains the current master and rewrote the
commit message to try to make this change technically a bit more
easy to understand.
Original patch submit:
http://thread.gmane.org/gmane.comp.version-control.git/251147/
git-rebase--interactive.sh | 18 +++++++-----------
t/t3404-rebase-interactive.sh | 16 ++++++++++++++++
2 files changed, 23 insertions(+), 11 deletions(-)
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index b938a6d..c0cfe88 100644
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -81,17 +81,13 @@ rewritten_pending="$state_dir"/rewritten-pending
# and leaves CR at the end instead.
cr=$(printf "\015")
-strategy_args=
-if test -n "$do_merge"
-then
- strategy_args=${strategy:+--strategy=$strategy}
- eval '
- for strategy_opt in '"$strategy_opts"'
- do
- strategy_args="$strategy_args -X$(git rev-parse --sq-quote "${strategy_opt#--}")"
- done
- '
-fi
+strategy_args=${strategy:+--strategy=$strategy}
+eval '
+ for strategy_opt in '"$strategy_opts"'
+ do
+ strategy_args="$strategy_args -X$(git rev-parse --sq-quote "${strategy_opt#--}")"
+ done
+'
GIT_CHERRY_PICK_HELP="$resolvemsg"
export GIT_CHERRY_PICK_HELP
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
index 98eb49a..9a2461c 100755
--- a/t/t3404-rebase-interactive.sh
+++ b/t/t3404-rebase-interactive.sh
@@ -1006,6 +1006,22 @@ test_expect_success 'rebase -i with --strategy and -X' '
test $(cat file1) = Z
'
+test_expect_success 'interrupted rebase -i with --strategy and -X' '
+ git checkout -b conflict-merge-use-theirs-interrupted conflict-branch &&
+ git reset --hard HEAD^ &&
+ >breakpoint &&
+ git add breakpoint &&
+ git commit -m "breakpoint for interactive mode" &&
+ echo five >conflict &&
+ echo Z >file1 &&
+ git commit -a -m "one file conflict" &&
+ set_fake_editor &&
+ FAKE_LINES="edit 1 2" git rebase -i --strategy=recursive -Xours conflict-branch &&
+ git rebase --continue &&
+ test $(git show conflict-branch:conflict) = $(cat conflict) &&
+ test $(cat file1) = Z
+'
+
test_expect_success 'rebase -i error on commits with \ in message' '
current_head=$(git rev-parse HEAD) &&
test_when_finished "git rebase --abort; git reset --hard $current_head; rm -f error" &&
--
2.7.0.rc0.174.g1b62464
next prev parent reply other threads:[~2015-12-11 19:54 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-10 0:02 [PATCH] rebase -i: Remember merge options beyond continue actions Fabian Ruch
2014-06-10 0:17 ` Eric Sunshine
2014-06-10 0:37 ` Fabian Ruch
2014-06-11 21:13 ` Michael Haggerty
2014-07-18 17:03 ` Ralf Thielow
2015-12-11 19:54 ` Ralf Thielow [this message]
2015-12-11 20:07 ` [PATCH] rebase -i: remember " Junio C Hamano
2015-12-11 20:30 ` [PATCH v2] " Ralf Thielow
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1449863646-26067-1-git-send-email-ralf.thielow@gmail.com \
--to=ralf.thielow@gmail.com \
--cc=bafain@gmail.com \
--cc=campos@esss.com.br \
--cc=git@vger.kernel.org \
--cc=mhagger@alum.mit.edu \
--cc=sunshine@sunshineco.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).