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

commit: use enum value for multiple cherry-picks

Browse Source 
Add FROM_CHERRY_PICK_MULTI for a sequence of cherry-picks rather than
using a separate variable.

Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Phillip Wood
2019-12-06 16:06:10 +00:00
committed by Junio C Hamano
parent 21b11c6d1d
commit 8d57f75749
2 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
wt-status.h
View File

@@ -38,9 +38,16 @@ enum show_ignored_type {
enum commit_whence {
FROM_COMMIT, /* normal */
FROM_MERGE, /* commit came from merge */
FROM_CHERRY_PICK /* commit came from cherry-pick */
FROM_CHERRY_PICK_SINGLE, /* commit came from cherry-pick */
FROM_CHERRY_PICK_MULTI /* commit came from a sequence of cherry-picks */
};
static inline int is_from_cherry_pick(enum commit_whence whence)
{
return whence == FROM_CHERRY_PICK_SINGLE ||
whence == FROM_CHERRY_PICK_MULTI;
}
struct wt_status_change_data {
int worktree_status;
int index_status;