summaryrefslogtreecommitdiff
path: root/notes-cache.h
diff options
context:
space:
mode:
authorLibravatar Denton Liu <liu.denton@gmail.com>2020-04-07 10:27:58 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-04-10 09:28:02 -0700
commit86ed00aff4b86eed6ecc606e9d5f7828a1dca353 (patch)
tree25ffee60f467f9e4b343f21e09b2f2db2795526c /notes-cache.h
parentsequencer: rename stash_sha1 to stash_oid (diff)
downloadtgif-86ed00aff4b86eed6ecc606e9d5f7828a1dca353.tar.xz
rebase: use apply_autostash() from sequencer.c
The apply_autostash() function in builtin/rebase.c is similar enough to the apply_autostash() function in sequencer.c that they are almost interchangeable, except for the type of arg they accept. Make the sequencer.c version extern and use it in rebase. The rebase version was introduced in 6defce2b02 (builtin rebase: support `--autostash` option, 2018-09-04) as part of the shell to C conversion. It opted to duplicate the function because, at the time, there was another in-progress project converting interactive rebase from shell to C as well and they did not want to clash with them by refactoring sequencer.c version of apply_autostash(). Since both efforts are long done, we can freely combine them together now. Signed-off-by: Denton Liu <liu.denton@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'notes-cache.h')
0 files changed, 0 insertions, 0 deletions