completion: nounset mode fixes

[thirdparty/git.git] / wt-status.h

diff --git a/wt-status.h b/wt-status.h
index 71c3f25f43deffd56cb6cc73cb76b3cbfaa66290..73ab5d4da1c0b4766cb63501b9db06c0a7fea934 100644 (file)
--- a/wt-status.h
+++ b/wt-status.h
@@ -38,9 +38,22 @@ 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 */
+       FROM_REBASE_PICK /* commit came from a pick/reword/edit */
 };
 
+static inline int is_from_cherry_pick(enum commit_whence whence)
+{
+       return whence == FROM_CHERRY_PICK_SINGLE ||
+               whence == FROM_CHERRY_PICK_MULTI;
+}
+
+static inline int is_from_rebase(enum commit_whence whence)
+{
+       return whence == FROM_REBASE_PICK;
+}
+
 struct wt_status_change_data {
        int worktree_status;
        int index_status;