It is useful to see the full patch while resolving conflicts in a
rebase. The only way to do it now is
less .git/rebase-*/patch
which could turn out to be a lot longer to type [1] if you are in a
linked worktree, or not at top-dir. On top of that, an ordinary user
should not need to peek into .git directory. The new option is
provided to examine the patch.
[1] A conflict caused by git-rebase--am.sh does show the path to this
patch file so you could copy/paste. But then after some time and
lots of commands to resolve the conflict, that path is likely
scrolled out of your terminal.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclo...@gmail.com>
---
Documentation/git-rebase.txt | 5 +++-
contrib/completion/git-completion.bash | 4 +--
git-rebase--am.sh | 3 +++
git-rebase--interactive.sh | 4 +++
git-rebase--merge.sh | 4 +++
git-rebase.sh | 7 +++++-
t/t3400-rebase.sh | 34 ++++++++++++++++++++++++++
t/t3404-rebase-interactive.sh | 6 +++++
8 files changed, 63 insertions(+), 4 deletions(-)
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index 8a861c1e0d..4fd571d393 100644
--- a/Documentation/git-rebase.txt
+++ b/Documentation/git-rebase.txt
@@ -12,7 +12,7 @@ SYNOPSIS
[<upstream> [<branch>]]
'git rebase' [-i | --interactive] [options] [--exec <cmd>] [--onto <newbase>]
--root [<branch>]
-'git rebase' --continue | --skip | --abort | --quit | --edit-todo
+'git rebase' --continue | --skip | --abort | --quit | --edit-todo |
--show-patch
DESCRIPTION
-----------
@@ -250,6 +250,9 @@ leave out at most one of A and B, in which case it defaults
to HEAD.
--edit-todo::
Edit the todo list during an interactive rebase.
+--show-patch::
+ Show the current patch in an interactive rebase.
+
-m::
--merge::
Use merging strategies to rebase. When the recursive (default) merge
diff --git a/contrib/completion/git-completion.bash
b/contrib/completion/git-completion.bash
index 1e9105f6d5..b70da4990f 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1992,11 +1992,11 @@ _git_rebase ()
{
__git_find_repo_path
if [ -f "$__git_repo_path"/rebase-merge/interactive ]; then
- __gitcomp "--continue --skip --abort --quit --edit-todo"
+ __gitcomp "--continue --skip --abort --quit --edit-todo
--show-patch"
return
elif [ -d "$__git_repo_path"/rebase-apply ] || \
[ -d "$__git_repo_path"/rebase-merge ]; then
- __gitcomp "--continue --skip --abort --quit"
+ __gitcomp "--continue --skip --abort --quit --show-patch"
return
fi
__git_complete_strategy && return
diff --git a/git-rebase--am.sh b/git-rebase--am.sh
index 14c50782e0..564a4a5830 100644
--- a/git-rebase--am.sh
+++ b/git-rebase--am.sh
@@ -27,6 +27,9 @@ skip)
move_to_original_branch
return
;;
+show-patch)
+ exec git am --show-patch
+ ;;
esac
if test -z "$rebase_root"
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index d47bd29593..01cc002efd 100644
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -840,6 +840,10 @@ To continue rebase after editing, run:
exit
;;
+show-patch)
+ cmt="$(cat "$state_dir/stopped-sha")"
+ exec git format-patch --subject-prefix= --stdout "${cmt}^!"
+ ;;
esac
comment_for_reflog start
diff --git a/git-rebase--merge.sh b/git-rebase--merge.sh
index 06a4723d4d..5c513a9736 100644
--- a/git-rebase--merge.sh
+++ b/git-rebase--merge.sh
@@ -137,6 +137,10 @@ skip)
finish_rb_merge
return
;;
+show-patch)
+ cmt="$(cat "$state_dir/current")"
+ exec git format-patch --subject-prefix= --stdout "${cmt}^!"
+ ;;
esac
mkdir -p "$state_dir"
diff --git a/git-rebase.sh b/git-rebase.sh
index fd72a35c65..ce17090520 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -45,6 +45,7 @@ abort! abort and check out the original branch
skip! skip current patch and continue
edit-todo! edit the todo list during an interactive rebase
quit! abort but keep HEAD where it is
+show-patch! show the patch file being applied or merged
"
. git-sh-setup
set_reflog_action rebase
@@ -245,7 +246,7 @@ do
--verify)
ok_to_skip_pre_rebase=
;;
- --continue|--skip|--abort|--quit|--edit-todo)
+ --continue|--skip|--abort|--quit|--edit-todo|--show-patch)
test $total_argc -eq 2 || usage
action=${1##--}
;;
@@ -412,6 +413,10 @@ quit)
edit-todo)
run_specific_rebase
;;
+show-patch)
+ run_specific_rebase
+ die "BUG: run_specific_rebase is not supposed to return here"
+ ;;
esac
# Make sure no rebase is in progress
diff --git a/t/t3400-rebase.sh b/t/t3400-rebase.sh
index 8ac58d5ea5..599f0d5606 100755
--- a/t/t3400-rebase.sh
+++ b/t/t3400-rebase.sh
@@ -277,4 +277,38 @@ EOF
test_cmp From_.msg out
'
+test_expect_success 'rebase--am.sh and --show-patch' '
+ test_create_repo conflict-apply &&
+ (
+ cd conflict-apply &&
+ test_commit init &&
+ echo one >>init.t &&
+ git commit -a -m one &&
+ echo two >>init.t &&
+ git commit -a -m two &&
+ git tag two &&
+ test_must_fail git rebase --onto init HEAD^ &&
+ git rebase --show-patch >actual.patch &&
+ test_cmp .git/rebase-apply/0001 actual.patch
+ )
+'
+
+test_expect_success 'rebase--merge.sh and --show-patch' '
+ test_create_repo conflict-merge &&
+ (
+ cd conflict-merge &&
+ test_commit init &&
+ echo one >>init.t &&
+ git commit -a -m one &&
+ echo two >>init.t &&
+ git commit -a -m two &&
+ git tag two &&
+ test_must_fail git rebase --merge --onto init HEAD^ &&
+ git rebase --show-patch >actual.patch &&
+ cmt=$(cat .git/rebase-merge/current) &&
+ git format-patch --stdout --subject-prefix= ${cmt}^!
>expected.patch &&
+ test_cmp expected.patch actual.patch
+ )
+'
+
test_done
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
index 481a350090..40f70a0333 100755
--- a/t/t3404-rebase-interactive.sh
+++ b/t/t3404-rebase-interactive.sh
@@ -225,6 +225,12 @@ test_expect_success 'stop on conflicting pick' '
test 0 = $(grep -c "^[^#]" < .git/rebase-merge/git-rebase-todo)
'
+test_expect_success 'show conflicted patch' '
+ git rebase --show-patch >actual.patch &&
+ git format-patch --subject-prefix= --stdout new-branch1^!
>expected.patch &&
+ test_cmp expected.patch actual.patch
+'
+
test_expect_success 'abort' '
git rebase --abort &&
test $(git rev-parse new-branch1) = $(git rev-parse HEAD) &&
--
2.16.1.205.g271f633410
