summaryrefslogtreecommitdiff
path: root/git-rebase--am.sh
diff options
context:
space:
mode:
authorPhillip Wood <phillip.wood@dunelm.org.uk>2017-08-02 11:44:16 +0100
committerJunio C Hamano <gitster@pobox.com>2017-08-02 15:16:09 -0700
commit5fb415b57f93330b5ceb743ac36d99da10ac00b1 (patch)
tree82805d3fcff2ddcdb41cdf1a4c47107ef5b3d32b /git-rebase--am.sh
parentfd4a3f486d97682a0f42dfc84fe7af742bd76230 (diff)
downloadgit-5fb415b57f93330b5ceb743ac36d99da10ac00b1.tar.gz
rebase: honor --rerere-autoupdate
Rebase accepts '--rerere-autoupdate' as an option but only honors it if '-m' is also given. Fix it for a non-interactive rebase by passing on the option to 'git am' and 'git cherry-pick'. Rework the tests so that they can be used for each rebase flavor and extend them. Reported-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-rebase--am.sh')
-rw-r--r--git-rebase--am.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/git-rebase--am.sh b/git-rebase--am.sh
index 375239341f..319933e70a 100644
--- a/git-rebase--am.sh
+++ b/git-rebase--am.sh
@@ -45,7 +45,7 @@ then
# itself well to recording empty patches. fortunately, cherry-pick
# makes this easy
git cherry-pick ${gpg_sign_opt:+"$gpg_sign_opt"} --allow-empty \
- --right-only "$revisions" \
+ $allow_rerere_autoupdate --right-only "$revisions" \
${restrict_revision+^$restrict_revision}
ret=$?
else
@@ -82,6 +82,7 @@ else
fi
git am $git_am_opt --rebasing --resolvemsg="$resolvemsg" \
+ $allow_rerere_autoupdate \
${gpg_sign_opt:+"$gpg_sign_opt"} <"$GIT_DIR/rebased-patches"
ret=$?