Revision 9a1b7474d6babad5fabed9a2926a57d875f3820b authored by Elijah Newren on 11 March 2020, 15:30:22 UTC, committed by Junio C Hamano on 11 March 2020, 19:11:05 UTC
In commit e98c4269c8 ("rebase (interactive-backend): fix handling of
commits that become empty", 2020-02-15), the merge backend was changed
to drop commits that did not start empty but became so after being
applied (because their changes were a subset of what was already
upstream). This new code path did not need to go through the process of
creating a commit, since we were dropping the commit instead.
Unfortunately, this also means we bypassed the clearing of the
CHERRY_PICK_HEAD and MERGE_MSG files, which if there were no further
commits to cherry-pick would mean that the rebase would end but assume
there was still an operation in progress. Ensure that we clear such
state files when we decide to drop the commit.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 937d143
tr2_sid.h
#ifndef TR2_SID_H
#define TR2_SID_H
/*
* Get our session id. Compute if necessary.
*/
const char *tr2_sid_get(void);
/*
* Get our process depth. A top-level git process invoked from the
* command line will have depth=0. A child git process will have
* depth=1 and so on.
*/
int tr2_sid_depth(void);
void tr2_sid_release(void);
#endif /* TR2_SID_H */
Computing file changes ...
