summaryrefslogtreecommitdiff
path: root/mergetools/vimdiff
diff options
context:
space:
mode:
authorLibravatar Johannes Schindelin <johannes.schindelin@gmx.de>2018-11-29 11:09:21 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-11-30 13:49:20 +0900
commit13a5a9f0fdcf36270dcc2dcb7752c281bbea06f1 (patch)
tree2700447a42ead46b95d3bb849ab4db8944296f75 /mergetools/vimdiff
parentMerge branch 'ja/i18n-fix' (diff)
downloadtgif-13a5a9f0fdcf36270dcc2dcb7752c281bbea06f1.tar.xz
rebase: fix GIT_REFLOG_ACTION regression
The scripted version of "rebase" honored the `GIT_REFLOG_ACTION`, and some automation scripts expected the reflog entries to be prefixed with "rebase -i", not "rebase", after running "rebase -i". This regressed in the reimplementation in C. Fix that, and add a regression test, both with `GIT_REFLOG_ACTION` set and unset. Note: the reflog message for "rebase finished" did *not* honor GIT_REFLOG_ACTION, and as we are very late in the v2.20.0-rcN phase, we leave that bug for later (as it seems that that bug has been with us from the very beginning). Reported by Ian Jackson. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'mergetools/vimdiff')
0 files changed, 0 insertions, 0 deletions