@matheusbsbs / matheus-bagliano / commits / 57a1498592

rebase --apply: remove duplicated code

Use move_to_original_branch() when reattaching HEAD after a fast-forward rather than open coding a copy of that code. move_to_original_branch() does not call reset_head() if head_name is NULL but there should be no user visible changes even though we currently call reset_head() in that case. The reason for this is that the reset_head() call does not add a message to the reflog because we're not changing the commit that HEAD points to and so lock_ref_for_update() elides the update. When head_name is not NULL then reset_head() behaves like "git symbolic-ref" and so the reflog is updated. Note that the removal of "strbuf_release(&msg)" is safe as there is an identical call just above this hunk which can be seen by viewing the diff with -U6. Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Phillip Wood committed Oct 12, 2022 at 09:35 UTC 57a1498592986c7532a37dd7f3eb96dc72d75878

1 file changed +1 -10

builtin/rebase.c

+1 -10

@@ -1811,19 +1811,10 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)

1811 * If the onto is a proper descendant of the tip of the branch, then

1812 * we just fast-forwarded.

1813 */

1814 - strbuf_reset(&msg);

1814 if (oideq(&branch_base, &options.orig_head->object.oid)) {

1815 printf(_("Fast-forwarded %s to %s.\n"),

1816 branch_name, options.onto_name);

1818 - strbuf_addf(&msg, "rebase finished: %s onto %s",

1819 - options.head_name ? options.head_name : "detached HEAD",

1820 - oid_to_hex(&options.onto->object.oid));

1821 - memset(&ropts, 0, sizeof(ropts));

1822 - ropts.branch = options.head_name;

1823 - ropts.flags = RESET_HEAD_REFS_ONLY;

1824 - ropts.head_msg = msg.buf;

1825 - reset_head(the_repository, &ropts);

1826 - strbuf_release(&msg);

1817 + move_to_original_branch(&options);

1818 ret = finish_rebase(&options);

1819 goto cleanup;

1820 }