summaryrefslogtreecommitdiff
path: root/wt-status.h
diff options
context:
space:
mode:
authorJeff Hostetler <jeffhost@microsoft.com>2018-01-09 18:50:16 +0000
committerJunio C Hamano <gitster@pobox.com>2018-01-24 13:48:38 -0800
commitfd9b544a2991ad74d73ad1bc0af4d24f91a6802b (patch)
tree175285017f510542e6bf558d94d025518bd3dd5d /wt-status.h
parentd7d1b496aeea5a151c826683ed28c57ef0ac9389 (diff)
downloadgit-fd9b544a2991ad74d73ad1bc0af4d24f91a6802b.tar.gz
status: add --[no-]ahead-behind to status and commit for V2 format.
Teach "git status" and "git commit" to accept "--no-ahead-behind" and "--ahead-behind" arguments to request quick or full ahead/behind reporting. When "--no-ahead-behind" is given, the existing porcelain V2 line "branch.ab +x -y" is replaced with a new "branch.ab +? -?" line. This indicates that the branch and its upstream are or are not equal without the expense of computing the full ahead/behind values. Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'wt-status.h')
-rw-r--r--wt-status.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/wt-status.h b/wt-status.h
index fe27b465e2..b91267455b 100644
--- a/wt-status.h
+++ b/wt-status.h
@@ -5,6 +5,7 @@
#include "string-list.h"
#include "color.h"
#include "pathspec.h"
+#include "remote.h"
struct worktree;
@@ -86,6 +87,7 @@ struct wt_status {
int show_branch;
int show_stash;
int hints;
+ enum ahead_behind_flags ahead_behind_flags;
enum wt_status_format status_format;
unsigned char sha1_commit[GIT_MAX_RAWSZ]; /* when not Initial */