diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-03-08 12:36:24 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-03-08 12:36:24 -0800 |
| commit | 4094e47fd2c49fcdbd0152d20ed4d610d72680d7 (patch) | |
| tree | 6f444715c2f37cf75953f4df436b6adda1483357 /wt-status.h | |
| parent | c710d182ea6d3846f6f2dc6f1b6c7dbd35c2fce8 (diff) | |
| parent | f39a757dd93488103dde76e992a75edf2d772b62 (diff) | |
| download | git-4094e47fd2c49fcdbd0152d20ed4d610d72680d7.tar.gz | |
Merge branch 'jh/status-no-ahead-behind'
"git status" can spend a lot of cycles to compute the relation
between the current branch and its upstream, which can now be
disabled with "--no-ahead-behind" option.
* jh/status-no-ahead-behind:
status: support --no-ahead-behind in long format
status: update short status to respect --no-ahead-behind
status: add --[no-]ahead-behind to status and commit for V2 format.
stat_tracking_info: return +1 when branches not equal
Diffstat (limited to 'wt-status.h')
| -rw-r--r-- | wt-status.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/wt-status.h b/wt-status.h index 3f84d5c29f..ea2456daf2 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; @@ -87,6 +88,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 */ |