diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-04-01 09:05:45 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-04-01 09:05:45 -0700 |
| commit | afc2e81247042e11d9cf981ac5671746caddc22a (patch) | |
| tree | bd55302ff9258081eeb50570b4c6dd95da838238 /wt-status.h | |
| parent | 6d37c162bb5b9cb4453e43d4488e953fe65cc67e (diff) | |
| parent | 6deab24d8832e3cb2f554b827af521b094a2b32d (diff) | |
| download | git-afc2e81247042e11d9cf981ac5671746caddc22a.tar.gz git-afc2e81247042e11d9cf981ac5671746caddc22a.tar.xz | |
Merge branch 'nd/branch-show-rebase-bisect-state'
Add a bit more information to "git status" during a rebase/bisect
session.
* nd/branch-show-rebase-bisect-state:
status, branch: fix the misleading "bisecting" message
branch: show more information when HEAD is detached
status: show more info than "currently not on any branch"
wt-status: move wt_status_get_state() out to wt_status_print()
wt-status: split wt_status_state parsing function out
wt-status: move strbuf into read_and_strip_branch()
Diffstat (limited to 'wt-status.h')
| -rw-r--r-- | wt-status.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/wt-status.h b/wt-status.h index 74208c06f..be7a01617 100644 --- a/wt-status.h +++ b/wt-status.h @@ -80,13 +80,16 @@ struct wt_status_state { int rebase_interactive_in_progress; int cherry_pick_in_progress; int bisect_in_progress; - const char *branch; - const char *onto; + char *branch; + char *onto; + char *detached_from; + unsigned char detached_sha1[20]; }; void wt_status_prepare(struct wt_status *s); void wt_status_print(struct wt_status *s); void wt_status_collect(struct wt_status *s); +void wt_status_get_state(struct wt_status_state *state, int get_detached_from); void wt_shortstatus_print(struct wt_status *s); void wt_porcelain_print(struct wt_status *s); |