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

wt-status.c: split rebase detection out of wt_status_get_state()

Browse Source 
worktree.c:find_shared_symref() later needs to know if a branch is being
rebased, and only rebase, no cherry-pick, do detached branch... Split
this code so it can be used independently from other in-progress tests.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Nguyễn Thái Ngọc Duy
2016-04-22 20:01:30 +07:00
committed by Junio C Hamano
parent 2e641d5825
commit bcd522a149
2 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
wt-status.c
View File

@ -1360,15 +1360,11 @@ static void wt_status_get_detached_from(struct wt_status_state *state)
strbuf_release(&cb.buf); strbuf_release(&cb.buf);
} }
void wt_status_get_state(struct wt_status_state *state, int wt_status_check_rebase(struct wt_status_state *state)
int get_detached_from)
{ {
struct stat st; struct stat st;
unsigned char sha1[20];
if (!stat(git_path_merge_head(), &st)) { if (!stat(git_path("rebase-apply"), &st)) {
state->merge_in_progress = 1;
} else if (!stat(git_path("rebase-apply"), &st)) {
if (!stat(git_path("rebase-apply/applying"), &st)) { if (!stat(git_path("rebase-apply/applying"), &st)) {
state->am_in_progress = 1; state->am_in_progress = 1;
if (!stat(git_path("rebase-apply/patch"), &st) && !st.st_size) if (!stat(git_path("rebase-apply/patch"), &st) && !st.st_size)
@ -1385,6 +1381,21 @@ void wt_status_get_state(struct wt_status_state *state,
state->rebase_in_progress = 1; state->rebase_in_progress = 1;
state->branch = read_and_strip_branch("rebase-merge/head-name"); state->branch = read_and_strip_branch("rebase-merge/head-name");
state->onto = read_and_strip_branch("rebase-merge/onto"); state->onto = read_and_strip_branch("rebase-merge/onto");
} else
return 0;
return 1;
}
void wt_status_get_state(struct wt_status_state *state,
int get_detached_from)
{
struct stat st;
unsigned char sha1[20];
if (!stat(git_path_merge_head(), &st)) {
state->merge_in_progress = 1;
} else if (wt_status_check_rebase(state)) {
; /* all set */
} else if (!stat(git_path_cherry_pick_head(), &st) && } else if (!stat(git_path_cherry_pick_head(), &st) &&
!get_sha1("CHERRY_PICK_HEAD", sha1)) { !get_sha1("CHERRY_PICK_HEAD", sha1)) {
state->cherry_pick_in_progress = 1; state->cherry_pick_in_progress = 1;

1
wt-status.h
View File

@ -100,6 +100,7 @@ void wt_status_prepare(struct wt_status *s);
void wt_status_print(struct wt_status *s); void wt_status_print(struct wt_status *s);
void wt_status_collect(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_status_get_state(struct wt_status_state *state, int get_detached_from);
int wt_status_check_rebase(struct wt_status_state *state);
void wt_shortstatus_print(struct wt_status *s); void wt_shortstatus_print(struct wt_status *s);
void wt_porcelain_print(struct wt_status *s); void wt_porcelain_print(struct wt_status *s);