From b2f5171ecc2feb4192acd80f5a6b05c06e099e97 Mon Sep 17 00:00:00 2001 From: John Lin Date: Tue, 4 Jun 2019 07:02:21 -0700 Subject: [PATCH] status: remove the empty line after hints Before this patch, there is inconsistency between the status messages with hints and the ones without hints: there is an empty line between the title and the file list if hints are presented, but there isn't one if there are no hints. This patch remove the inconsistency by removing the empty lines even if hints are presented. Signed-off-by: John Lin Signed-off-by: Junio C Hamano --- t/t7060-wtstatus.sh | 5 ---- t/t7508-status.sh | 62 ------------------------------------------ t/t7512-status-help.sh | 14 ---------- wt-status.c | 4 --- 4 files changed, 85 deletions(-) diff --git a/t/t7060-wtstatus.sh b/t/t7060-wtstatus.sh index 53cf42fac1..d5218743e9 100755 --- a/t/t7060-wtstatus.sh +++ b/t/t7060-wtstatus.sh @@ -38,7 +38,6 @@ You have unmerged paths. Unmerged paths: (use "git add/rm ..." as appropriate to mark resolution) - deleted by us: foo no changes added to commit (use "git add" and/or "git commit -a") @@ -143,7 +142,6 @@ You have unmerged paths. Unmerged paths: (use "git add/rm ..." as appropriate to mark resolution) - both added: conflict.txt deleted by them: main.txt @@ -177,7 +175,6 @@ You have unmerged paths. Unmerged paths: (use "git add/rm ..." as appropriate to mark resolution) - both deleted: main.txt added by them: sub_master.txt added by us: sub_second.txt @@ -201,12 +198,10 @@ You have unmerged paths. (use "git merge --abort" to abort the merge) Changes to be committed: - new file: sub_master.txt Unmerged paths: (use "git rm ..." to mark resolution) - both deleted: main.txt Untracked files not listed (use -u option to show untracked files) diff --git a/t/t7508-status.sh b/t/t7508-status.sh index 681bc314b4..4e676cdce8 100755 --- a/t/t7508-status.sh +++ b/t/t7508-status.sh @@ -95,18 +95,15 @@ test_expect_success 'status --column' ' # # Changes to be committed: # (use "git restore --staged ..." to unstage) -# # new file: dir2/added # # Changes not staged for commit: # (use "git add ..." to update what will be committed) # (use "git restore ..." to discard changes in working directory) -# # modified: dir1/modified # # Untracked files: # (use "git add ..." to include in what will be committed) -# # dir1/untracked dir2/untracked # dir2/modified untracked # @@ -129,18 +126,15 @@ cat >expect <<\EOF # # Changes to be committed: # (use "git restore --staged ..." to unstage) -# # new file: dir2/added # # Changes not staged for commit: # (use "git add ..." to update what will be committed) # (use "git restore ..." to discard changes in working directory) -# # modified: dir1/modified # # Untracked files: # (use "git add ..." to include in what will be committed) -# # dir1/untracked # dir2/modified # dir2/untracked @@ -279,23 +273,19 @@ and have 1 and 2 different commits each, respectively. Changes to be committed: (use "git restore --staged ..." to unstage) - new file: dir2/added Changes not staged for commit: (use "git add ..." to update what will be committed) (use "git restore ..." to discard changes in working directory) - modified: dir1/modified Untracked files: (use "git add ..." to include in what will be committed) - dir2/modified Ignored files: (use "git add -f ..." to include in what will be committed) - .gitignore dir1/untracked dir2/untracked @@ -348,18 +338,15 @@ and have 1 and 2 different commits each, respectively. Changes to be committed: (use "git restore --staged ..." to unstage) - new file: dir2/added Changes not staged for commit: (use "git add ..." to update what will be committed) (use "git restore ..." to discard changes in working directory) - modified: dir1/modified Ignored files: (use "git add -f ..." to include in what will be committed) - .gitignore dir1/untracked dir2/modified @@ -421,13 +408,11 @@ and have 1 and 2 different commits each, respectively. Changes to be committed: (use "git restore --staged ..." to unstage) - new file: dir2/added Changes not staged for commit: (use "git add ..." to update what will be committed) (use "git restore ..." to discard changes in working directory) - modified: dir1/modified Untracked files not listed (use -u option to show untracked files) @@ -485,18 +470,15 @@ and have 1 and 2 different commits each, respectively. Changes to be committed: (use "git restore --staged ..." to unstage) - new file: dir2/added Changes not staged for commit: (use "git add ..." to update what will be committed) (use "git restore ..." to discard changes in working directory) - modified: dir1/modified Untracked files: (use "git add ..." to include in what will be committed) - dir1/untracked dir2/modified dir2/untracked @@ -543,18 +525,15 @@ and have 1 and 2 different commits each, respectively. Changes to be committed: (use "git restore --staged ..." to unstage) - new file: dir2/added Changes not staged for commit: (use "git add ..." to update what will be committed) (use "git restore ..." to discard changes in working directory) - modified: dir1/modified Untracked files: (use "git add ..." to include in what will be committed) - dir1/untracked dir2/modified dir2/untracked @@ -606,18 +585,15 @@ and have 1 and 2 different commits each, respectively. Changes to be committed: (use "git restore --staged ..." to unstage) - new file: ../dir2/added Changes not staged for commit: (use "git add ..." to update what will be committed) (use "git restore ..." to discard changes in working directory) - modified: modified Untracked files: (use "git add ..." to include in what will be committed) - untracked ../dir2/modified ../dir2/untracked @@ -677,18 +653,15 @@ and have 1 and 2 different commits each, respectively. Changes to be committed: (use "git restore --staged ..." to unstage) - new file: dir2/added Changes not staged for commit: (use "git add ..." to update what will be committed) (use "git restore ..." to discard changes in working directory) - modified: dir1/modified Untracked files: (use "git add ..." to include in what will be committed) - dir1/untracked dir2/modified dir2/untracked @@ -803,18 +776,15 @@ and have 1 and 2 different commits each, respectively. Changes to be committed: (use "git restore --staged ..." to unstage) - new file: dir2/added Changes not staged for commit: (use "git add ..." to update what will be committed) (use "git restore ..." to discard changes in working directory) - modified: dir1/modified Untracked files: (use "git add ..." to include in what will be committed) - dir1/untracked dir2/modified dir2/untracked @@ -853,12 +823,10 @@ and have 1 and 2 different commits each, respectively. Changes to be committed: (use "git restore --staged ..." to unstage) - modified: dir1/modified Untracked files: (use "git add ..." to include in what will be committed) - dir1/untracked dir2/ untracked @@ -897,19 +865,16 @@ and have 1 and 2 different commits each, respectively. Changes to be committed: (use "git restore --staged ..." to unstage) - new file: dir2/added new file: sm Changes not staged for commit: (use "git add ..." to update what will be committed) (use "git restore ..." to discard changes in working directory) - modified: dir1/modified Untracked files: (use "git add ..." to include in what will be committed) - dir1/untracked dir2/modified dir2/untracked @@ -957,14 +922,12 @@ and have 1 and 2 different commits each, respectively. Changes to be committed: (use "git restore --staged ..." to unstage) - new file: dir2/added new file: sm Changes not staged for commit: (use "git add ..." to update what will be committed) (use "git restore ..." to discard changes in working directory) - modified: dir1/modified Submodule changes to be committed: @@ -974,7 +937,6 @@ Submodule changes to be committed: Untracked files: (use "git add ..." to include in what will be committed) - dir1/untracked dir2/modified dir2/untracked @@ -1020,12 +982,10 @@ and have 2 and 2 different commits each, respectively. Changes not staged for commit: (use "git add ..." to update what will be committed) (use "git restore ..." to discard changes in working directory) - modified: dir1/modified Untracked files: (use "git add ..." to include in what will be committed) - dir1/untracked dir2/modified dir2/untracked @@ -1069,14 +1029,12 @@ and have 2 and 2 different commits each, respectively. Changes to be committed: (use "git restore --source=HEAD^1 --staged ..." to unstage) - new file: dir2/added new file: sm Changes not staged for commit: (use "git add ..." to update what will be committed) (use "git restore ..." to discard changes in working directory) - modified: dir1/modified Submodule changes to be committed: @@ -1086,7 +1044,6 @@ Submodule changes to be committed: Untracked files: (use "git add ..." to include in what will be committed) - dir1/untracked dir2/modified dir2/untracked @@ -1124,13 +1081,11 @@ and have 2 and 2 different commits each, respectively. Changes to be committed: (use "git restore --staged ..." to unstage) - modified: sm Changes not staged for commit: (use "git add ..." to update what will be committed) (use "git restore ..." to discard changes in working directory) - modified: dir1/modified Submodule changes to be committed: @@ -1140,7 +1095,6 @@ Submodule changes to be committed: Untracked files: (use "git add ..." to include in what will be committed) - .gitmodules dir1/untracked dir2/modified @@ -1236,14 +1190,12 @@ and have 2 and 2 different commits each, respectively. Changes to be committed: (use "git restore --staged ..." to unstage) - modified: sm Changes not staged for commit: (use "git add ..." to update what will be committed) (use "git restore ..." to discard changes in working directory) (commit or discard the untracked or modified content in submodules) - modified: dir1/modified modified: sm (modified content) @@ -1254,7 +1206,6 @@ Submodule changes to be committed: Untracked files: (use "git add ..." to include in what will be committed) - .gitmodules dir1/untracked dir2/modified @@ -1296,13 +1247,11 @@ and have 2 and 2 different commits each, respectively. Changes to be committed: (use "git restore --staged ..." to unstage) - modified: sm Changes not staged for commit: (use "git add ..." to update what will be committed) (use "git restore ..." to discard changes in working directory) - modified: dir1/modified modified: sm (new commits) @@ -1318,7 +1267,6 @@ Submodules changed but not updated: Untracked files: (use "git add ..." to include in what will be committed) - .gitmodules dir1/untracked dir2/modified @@ -1380,13 +1328,11 @@ cat > expect << EOF ; ; Changes to be committed: ; (use "git restore --staged ..." to unstage) -; ; modified: sm ; ; Changes not staged for commit: ; (use "git add ..." to update what will be committed) ; (use "git restore ..." to discard changes in working directory) -; ; modified: dir1/modified ; modified: sm (new commits) ; @@ -1402,7 +1348,6 @@ cat > expect << EOF ; ; Untracked files: ; (use "git add ..." to include in what will be committed) -; ; .gitmodules ; dir1/untracked ; dir2/modified @@ -1432,12 +1377,10 @@ and have 2 and 2 different commits each, respectively. Changes not staged for commit: (use "git add ..." to update what will be committed) (use "git restore ..." to discard changes in working directory) - modified: dir1/modified Untracked files: (use "git add ..." to include in what will be committed) - .gitmodules dir1/untracked dir2/modified @@ -1459,18 +1402,15 @@ and have 2 and 2 different commits each, respectively. Changes to be committed: (use "git restore --staged ..." to unstage) - modified: sm Changes not staged for commit: (use "git add ..." to update what will be committed) (use "git restore ..." to discard changes in working directory) - modified: dir1/modified Untracked files: (use "git add ..." to include in what will be committed) - .gitmodules dir1/untracked dir2/modified @@ -1582,13 +1522,11 @@ and have 2 and 2 different commits each, respectively. Changes to be committed: (use "git restore --staged ..." to unstage) - modified: sm Changes not staged for commit: (use "git add ..." to update what will be committed) (use "git restore ..." to discard changes in working directory) - modified: dir1/modified Untracked files not listed (use -u option to show untracked files) diff --git a/t/t7512-status-help.sh b/t/t7512-status-help.sh index 1b9712c675..bf0b2c8bdb 100755 --- a/t/t7512-status-help.sh +++ b/t/t7512-status-help.sh @@ -33,7 +33,6 @@ You have unmerged paths. Unmerged paths: (use "git add ..." to mark resolution) - both modified: main.txt no changes added to commit (use "git add" and/or "git commit -a") @@ -54,7 +53,6 @@ All conflicts fixed but you are still merging. (use "git commit" to conclude merge) Changes to be committed: - modified: main.txt Untracked files not listed (use -u option to show untracked files) @@ -87,7 +85,6 @@ You are currently rebasing branch '\''rebase_conflicts'\'' on '\''$ONTO'\''. Unmerged paths: (use "git restore --staged ..." to unstage) (use "git add ..." to mark resolution) - both modified: main.txt no changes added to commit (use "git add" and/or "git commit -a") @@ -111,7 +108,6 @@ You are currently rebasing branch '\''rebase_conflicts'\'' on '\''$ONTO'\''. Changes to be committed: (use "git restore --staged ..." to unstage) - modified: main.txt Untracked files not listed (use -u option to show untracked files) @@ -150,7 +146,6 @@ You are currently rebasing branch '\''rebase_i_conflicts_second'\'' on '\''$ONTO Unmerged paths: (use "git restore --staged ..." to unstage) (use "git add ..." to mark resolution) - both modified: main.txt no changes added to commit (use "git add" and/or "git commit -a") @@ -177,7 +172,6 @@ You are currently rebasing branch '\''rebase_i_conflicts_second'\'' on '\''$ONTO Changes to be committed: (use "git restore --staged ..." to unstage) - modified: main.txt Untracked files not listed (use -u option to show untracked files) @@ -247,7 +241,6 @@ You are currently splitting a commit while rebasing branch '\''split_commit'\'' Changes not staged for commit: (use "git add ..." to update what will be committed) (use "git restore ..." to discard changes in working directory) - modified: main.txt no changes added to commit (use "git add" and/or "git commit -a") @@ -355,7 +348,6 @@ You are currently splitting a commit while rebasing branch '\''several_edits'\'' Changes not staged for commit: (use "git add ..." to update what will be committed) (use "git restore ..." to discard changes in working directory) - modified: main.txt no changes added to commit (use "git add" and/or "git commit -a") @@ -454,7 +446,6 @@ You are currently splitting a commit while rebasing branch '\''several_edits'\'' Changes not staged for commit: (use "git add ..." to update what will be committed) (use "git restore ..." to discard changes in working directory) - modified: main.txt no changes added to commit (use "git add" and/or "git commit -a") @@ -558,7 +549,6 @@ You are currently splitting a commit while rebasing branch '\''several_edits'\'' Changes not staged for commit: (use "git add ..." to update what will be committed) (use "git restore ..." to discard changes in working directory) - modified: main.txt no changes added to commit (use "git add" and/or "git commit -a") @@ -747,7 +737,6 @@ You are currently cherry-picking commit $TO_CHERRY_PICK. Unmerged paths: (use "git add ..." to mark resolution) - both modified: main.txt no changes added to commit (use "git add" and/or "git commit -a") @@ -771,7 +760,6 @@ You are currently cherry-picking commit $TO_CHERRY_PICK. (use "git cherry-pick --abort" to cancel the cherry-pick operation) Changes to be committed: - modified: main.txt Untracked files not listed (use -u option to show untracked files) @@ -818,7 +806,6 @@ You are currently reverting commit $TO_REVERT. Unmerged paths: (use "git restore --staged ..." to unstage) (use "git add ..." to mark resolution) - both modified: to-revert.txt no changes added to commit (use "git add" and/or "git commit -a") @@ -838,7 +825,6 @@ You are currently reverting commit $TO_REVERT. Changes to be committed: (use "git restore --staged ..." to unstage) - modified: to-revert.txt Untracked files not listed (use -u option to show untracked files) diff --git a/wt-status.c b/wt-status.c index 19fd1add75..ddab6b93be 100644 --- a/wt-status.c +++ b/wt-status.c @@ -199,7 +199,6 @@ static void wt_longstatus_print_unmerged_header(struct wt_status *s) } else { status_printf_ln(s, c, _(" (use \"git add/rm ...\" as appropriate to mark resolution)")); } - status_printf_ln(s, c, "%s", ""); } static void wt_longstatus_print_cached_header(struct wt_status *s) @@ -221,7 +220,6 @@ static void wt_longstatus_print_cached_header(struct wt_status *s) s->reference); } else status_printf_ln(s, c, _(" (use \"git rm --cached ...\" to unstage)")); - status_printf_ln(s, c, "%s", ""); } static void wt_longstatus_print_dirty_header(struct wt_status *s, @@ -240,7 +238,6 @@ static void wt_longstatus_print_dirty_header(struct wt_status *s, status_printf_ln(s, c, _(" (use \"git restore ...\" to discard changes in working directory)")); if (has_dirty_submodules) status_printf_ln(s, c, _(" (commit or discard the untracked or modified content in submodules)")); - status_printf_ln(s, c, "%s", ""); } static void wt_longstatus_print_other_header(struct wt_status *s, @@ -252,7 +249,6 @@ static void wt_longstatus_print_other_header(struct wt_status *s, if (!s->hints) return; status_printf_ln(s, c, _(" (use \"git %s ...\" to include in what will be committed)"), how); - status_printf_ln(s, c, "%s", ""); } static void wt_longstatus_print_trailer(struct wt_status *s)