[PATCHv5 3/3] status: don't suggest "git rm" or "git add" if not appropriate
- From
- Kong Lucien <lucien.kong@ensimag.imag.fr>
- Date
- May 31, 2012, 15:15 UTC
- Message-ID
- <1338477344-15940-3-git-send-email-Lucien.Kong@ensimag.imag.fr>
- In-Reply-To
- <1338477344-15940-1-git-send-email-Lucien.Kong@ensimag.imag.fr>
The display of the advice '(use git add/rm [...])' (when there are unmerged files) after running 'git status' is now depending of the mark, whether it's 'both deleted', 'deleted by us/them' or others. For instance, when there is just one file that's marked as 'both deleted', 'git status' shows '(use git rm [...])' and if there are two files, one as 'both deleted' and the other as 'added by them', the advice is '(use git add/rm [...])'.
The previous tests in t7512-status-help.sh are updated.
Test about the case of only 'both deleted' is added in t7060-wtstatus.sh
Signed-off-by: Kong Lucien <Lucien.Kong@ensimag.imag.fr> Signed-off-by: Duperray Valentin <Valentin.Duperray@ensimag.imag.fr> Signed-off-by: Jonas Franck <Franck.Jonas@ensimag.imag.fr> Signed-off-by: Nguy Thomas <Thomas.Nguy@ensimag.imag.fr> Signed-off-by: Nguyen Huynh Khoi Nguyen <Huynh-Khoi-Nguyen.Nguyen@ensimag.imag.fr> --- t/t7060-wtstatus.sh | 28 ++++++++++++++++++++++++++++ t/t7512-status-help.sh | 6 +++--- wt-status.c | 37 ++++++++++++++++++++++++++++++++++++- 3 files changed, 67 insertions(+), 4 deletions(-)
diff --git a/t/t7060-wtstatus.sh b/t/t7060-wtstatus.sh index 8a6d68a..60a1b99 100755 --- a/t/t7060-wtstatus.sh +++ b/t/t7060-wtstatus.sh @@ -189,4 +189,32 @@ test_expect_success 'status when conflicts with add and rm advice (both deleted) test_cmp expect output ' + +test_expect_success 'status when conflicts with only rm advice (both deleted)' ' + test_when_finished "cd ../ && rm -rf git" && + git add sub_master.txt && + git add sub_second.txt && + cat >expect <<-\EOF && + # On branch second_branch + # You have unmerged paths; fix conflicts and run "git commit". + # + # Changes to be committed: + # + # new file: sub_master.txt + # + # Unmerged paths: + # (use "git rm <file>..." to mark resolution) + # + # both deleted: main.txt + # + # Untracked files: + # (use "git add <file>..." to include in what will be committed) + # + # expect + # output + EOF + git status >output && + test_cmp expect output +' + test_done diff --git a/t/t7512-status-help.sh b/t/t7512-status-help.sh index af1d130..83c42df 100755 --- a/t/t7512-status-help.sh +++ b/t/t7512-status-help.sh @@ -27,7 +27,7 @@ test_expect_success 'status when conflicts unresolved' ' # You have unmerged paths; fix conflicts and run "git commit". # # Unmerged paths: - # (use "git add/rm <file>..." as appropriate to mark resolution) + # (use "git add <file>..." to mark resolution) # # both modified: main.txt # @@ -78,7 +78,7 @@ test_expect_success 'status when rebase in progress before resolving conflicts' # # Unmerged paths: # (use "git reset HEAD <file>..." to unstage) - # (use "git add/rm <file>..." as appropriate to mark resolution) + # (use "git add <file>..." to mark resolution) # # both modified: main.txt # @@ -306,7 +306,7 @@ test_expect_success 'status when cherry-picking before resolving conflicts' ' # You are currently cherry-picking: fix conflicts and run "git commit". # # Unmerged paths: - # (use "git add/rm <file>..." as appropriate to mark resolution) + # (use "git add <file>..." to mark resolution) # # both modified: main.txt # diff --git a/wt-status.c b/wt-status.c index f4ba021..ee503b8 100644 --- a/wt-status.c +++ b/wt-status.c @@ -131,9 +131,34 @@ void wt_status_prepare(struct wt_status *s) static void wt_status_print_unmerged_header(struct wt_status *s) { + int i; + int del_mod_conflict = 0; + int both_deleted = 0; + int not_deleted = 0; const char *c = color(WT_STATUS_HEADER, s); status_printf_ln(s, c, _("Unmerged paths:")); + + for (i = 0; i < s->change.nr; i++) { + struct string_list_item *it = &(s->change.items[i]); + struct wt_status_change_data *d = it->util; + + switch (d->stagemask) { + case 0: + break; + case 1: + both_deleted = 1; + break; + case 3: + case 5: + del_mod_conflict = 1; + break; + default: + not_deleted = 1; + break; + } + } + if (!advice_status_hints) return; if (s->whence != FROM_COMMIT) @@ -142,7 +167,17 @@ static void wt_status_print_unmerged_header(struct wt_status *s) status_printf_ln(s, c, _(" (use \"git reset %s <file>...\" to unstage)"), s->reference); else status_printf_ln(s, c, _(" (use \"git rm --cached <file>...\" to unstage)")); - status_printf_ln(s, c, _(" (use \"git add/rm <file>...\" as appropriate to mark resolution)")); + + if (!both_deleted) { + if (!del_mod_conflict) + status_printf_ln(s, c, _(" (use \"git add <file>...\" to mark resolution)")); + else + status_printf_ln(s, c, _(" (use \"git add/rm <file>...\" as appropriate to mark resolution)")); + } else if (!del_mod_conflict && !not_deleted) { + status_printf_ln(s, c, _(" (use \"git rm <file>...\" to mark resolution)")); + } else { + status_printf_ln(s, c, _(" (use \"git add/rm <file>...\" as appropriate to mark resolution)")); + } status_printf_ln(s, c, ""); }
-- 1.7.8