admin/git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sequencer: treat REVERT_HEAD as a pseudo ref

Browse Source 
Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Han-Wen Nienhuys
2020-08-21 16:59:37 +00:00
committed by Junio C Hamano
parent b6d2558c9e
commit b8825ef233
4 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
path.h
View File

@@ -170,7 +170,6 @@ void report_linked_checkout_garbage(void);
}
struct path_cache {
const char *revert_head;
const char *squash_msg;
const char *merge_msg;
const char *merge_rr;
@@ -181,12 +180,11 @@ struct path_cache {
const char *shallow;
};
#define PATH_CACHE_INIT \
{ \
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL \
#define PATH_CACHE_INIT \
{ \
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL \
}
const char *git_path_revert_head(struct repository *r);
const char *git_path_squash_msg(struct repository *r);
const char *git_path_merge_msg(struct repository *r);
const char *git_path_merge_rr(struct repository *r);