global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-01-17 06:13:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

status: rebase and merge can be in progress at the same time

Browse Source 
Since `git rebase -r` was introduced, that is possible. But our
machinery did not think that possible, and failed to say anything about
the rebase in progress when in the middle of a merge.

Let's work around that in the minimal fashion.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This commit is contained in:
Johannes Schindelin
2018-11-12 21:49:26 +01:00
parent f89ebfe880
commit 3171d55c36
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
wt-status.c
View File

@@ -1553,6 +1553,7 @@ void wt_status_get_state(struct wt_status_state *state,
struct object_id oid;
if (!stat(git_path_merge_head(the_repository), &st)) {
wt_status_check_rebase(NULL, state);
state->merge_in_progress = 1;
} else if (wt_status_check_rebase(NULL, state)) {
; /* all set */
@@ -1576,9 +1577,13 @@ static void wt_longstatus_print_state(struct wt_status *s,
struct wt_status_state *state)
{
const char *state_color = color(WT_STATUS_HEADER, s);
if (state->merge_in_progress)
if (state->merge_in_progress) {
if (state->rebase_interactive_in_progress) {
show_rebase_information(s, state, state_color);
fputs("\n", s->fp);
}
show_merge_in_progress(s, state, state_color);
else if (state->am_in_progress)
} else if (state->am_in_progress)
show_am_in_progress(s, state, state_color);
else if (state->rebase_in_progress || state->rebase_interactive_in_progress)
show_rebase_in_progress(s, state, state_color);