diff options
| author |  Phillip Wood <phillip.wood@dunelm.org.uk> | 2022-01-26 13:05:47 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2022-01-26 12:08:53 -0800 |
| commit | 7700ab087b82f71d19134141045b95063e407344 (patch) | |
| tree | 2d62f412b26cc08708c9fe6d633b5bf64e05b10d /Documentation/git-shell.txt | |
| parent | reset_head(): take struct rebase_head_opts (diff) | |
| download | tgif-7700ab087b82f71d19134141045b95063e407344.tar.xz | |
rebase --apply: fix reflog
move_to_original_branch() passes the message intended for the branch
reflog as `orig_head_msg`. Fix this by adding a `branch_msg` member to
struct reset_head_opts and add a regression test. Note that these
reflog messages do not respect GIT_REFLOG_ACTION. They are not alone
in that and will be fixed in a future series.
The "merge" backend already has tests that check both the branch and
HEAD reflogs.
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-shell.txt')
0 files changed, 0 insertions, 0 deletions