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

Merge branch 'nd/branch-show-rebase-bisect-state'

Browse Source 
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()
This commit is contained in:
Junio C Hamano
2013-04-01 09:05:45 -07:00
parent 6d37c162bb 6deab24d88
commit afc2e81247
7 changed files with 216 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
wt-status.h
View File

@ -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);