{"thread":{"id":"51098","subject":"[PATCH 0/1] status: remove the empty line after hints","startedAt":"2019-05-15T10:54:07Z","lastAt":"2019-06-04T14:02:26Z","messageCount":12,"participants":["John Lin via GitGitGadget","林自均","Junio C Hamano","Johannes Schindelin"],"isPatch":true,"patchVersion":1,"patchTotal":1},"messages":[{"id":"375619","messageId":"pull.196.git.gitgitgadget@gmail.com","threadId":"51098","inReplyTo":null,"subject":"[PATCH 0/1] status: remove the empty line after hints","fromName":"John Lin via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2019-05-15T10:54:02Z","receivedAt":"2019-05-15T10:54:07Z","isPatch":true,"sender":{"key":"johnlinp@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1290376?v=4"},"body":"Before this patch, there is inconsistency between the status messages with\nhints and the ones without hints: there is an empty line between the title\nand the file list if hints are presented, but there isn't one if there are\nno hints.\n\nThis patch remove the inconsistency by removing the empty lines even if\nhints are presented.\n\nJohn Lin (1):\n status: remove the empty line after hints\n\n t/t7060-wtstatus.sh | 5 ----\n t/t7508-status.sh | 62 ------------------------------------------\n t/t7512-status-help.sh | 14 ----------\n wt-status.c | 4 ---\n 4 files changed, 85 deletions(-)\n\n\nbase-commit: ab15ad1a3b4b04a29415aef8c9afa2f64fc194a2\nPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-196%2Fjohnlinp%2Ffix-status-empty-line-v1\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-196/johnlinp/fix-status-empty-line-v1\nPull-Request: https://github.com/gitgitgadget/git/pull/196\n-- \ngitgitgadget\n"},{"id":"375620","messageId":"468be8f85426ccf588ad558fab3c8927ef58627f.1557917642.git.gitgitgadget@gmail.com","threadId":"51098","inReplyTo":"pull.196.git.gitgitgadget@gmail.com","subject":"[PATCH 1/1] status: remove the empty line after hints","fromName":"John Lin via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2019-05-15T10:54:03Z","receivedAt":"2019-05-15T10:54:09Z","isPatch":true,"sender":{"key":"johnlinp@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1290376?v=4"},"body":"From: John Lin \n\nBefore this patch, there is inconsistency between the status\nmessages with hints and the ones without hints: there is an\nempty line between the title and the file list if hints are\npresented, but there isn't one if there are no hints.\n\nThis patch remove the inconsistency by removing the empty\nlines even if hints are presented.\n\nSigned-off-by: John Lin \n---\n t/t7060-wtstatus.sh | 5 ----\n t/t7508-status.sh | 62 ------------------------------------------\n t/t7512-status-help.sh | 14 ----------\n wt-status.c | 4 ---\n 4 files changed, 85 deletions(-)\n\ndiff --git a/t/t7060-wtstatus.sh b/t/t7060-wtstatus.sh\nindex 53cf42fac1..d5218743e9 100755\n--- a/t/t7060-wtstatus.sh\n+++ b/t/t7060-wtstatus.sh\n@@ -38,7 +38,6 @@ You have unmerged paths.\n \n Unmerged paths:\n (use \"git add/rm ...\" as appropriate to mark resolution)\n-\n \tdeleted by us: foo\n \n no changes added to commit (use \"git add\" and/or \"git commit -a\")\n@@ -143,7 +142,6 @@ You have unmerged paths.\n \n Unmerged paths:\n (use \"git add/rm ...\" as appropriate to mark resolution)\n-\n \tboth added: conflict.txt\n \tdeleted by them: main.txt\n \n@@ -177,7 +175,6 @@ You have unmerged paths.\n \n Unmerged paths:\n (use \"git add/rm ...\" as appropriate to mark resolution)\n-\n \tboth deleted: main.txt\n \tadded by them: sub_master.txt\n \tadded by us: sub_second.txt\n@@ -201,12 +198,10 @@ You have unmerged paths.\n (use \"git merge --abort\" to abort the merge)\n \n Changes to be committed:\n-\n \tnew file: sub_master.txt\n \n Unmerged paths:\n (use \"git rm ...\" to mark resolution)\n-\n \tboth deleted: main.txt\n \n Untracked files not listed (use -u option to show untracked files)\ndiff --git a/t/t7508-status.sh b/t/t7508-status.sh\nindex e1f11293e2..1cb1032c98 100755\n--- a/t/t7508-status.sh\n+++ b/t/t7508-status.sh\n@@ -95,18 +95,15 @@ test_expect_success 'status --column' '\n #\n # Changes to be committed:\n # (use \"git reset HEAD ...\" to unstage)\n-#\n #\tnew file: dir2/added\n #\n # Changes not staged for commit:\n # (use \"git add ...\" to update what will be committed)\n # (use \"git checkout -- ...\" to discard changes in working directory)\n-#\n #\tmodified: dir1/modified\n #\n # Untracked files:\n # (use \"git add ...\" to include in what will be committed)\n-#\n #\tdir1/untracked dir2/untracked\n #\tdir2/modified untracked\n #\n@@ -129,18 +126,15 @@ cat >expect <<\\EOF\n #\n # Changes to be committed:\n # (use \"git reset HEAD ...\" to unstage)\n-#\n #\tnew file: dir2/added\n #\n # Changes not staged for commit:\n # (use \"git add ...\" to update what will be committed)\n # (use \"git checkout -- ...\" to discard changes in working directory)\n-#\n #\tmodified: dir1/modified\n #\n # Untracked files:\n # (use \"git add ...\" to include in what will be committed)\n-#\n #\tdir1/untracked\n #\tdir2/modified\n #\tdir2/untracked\n@@ -279,23 +273,19 @@ and have 1 and 2 different commits each, respectively.\n \n Changes to be committed:\n (use \"git reset HEAD ...\" to unstage)\n-\n \tnew file: dir2/added\n \n Changes not staged for commit:\n (use \"git add ...\" to update what will be committed)\n (use \"git checkout -- ...\" to discard changes in working directory)\n-\n \tmodified: dir1/modified\n \n Untracked files:\n (use \"git add ...\" to include in what will be committed)\n-\n \tdir2/modified\n \n Ignored files:\n (use \"git add -f ...\" to include in what will be committed)\n-\n \t.gitignore\n \tdir1/untracked\n \tdir2/untracked\n@@ -348,18 +338,15 @@ and have 1 and 2 different commits each, respectively.\n \n Changes to be committed:\n (use \"git reset HEAD ...\" to unstage)\n-\n \tnew file: dir2/added\n \n Changes not staged for commit:\n (use \"git add ...\" to update what will be committed)\n (use \"git checkout -- ...\" to discard changes in working directory)\n-\n \tmodified: dir1/modified\n \n Ignored files:\n (use \"git add -f ...\" to include in what will be committed)\n-\n \t.gitignore\n \tdir1/untracked\n \tdir2/modified\n@@ -421,13 +408,11 @@ and have 1 and 2 different commits each, respectively.\n \n Changes to be committed:\n (use \"git reset HEAD ...\" to unstage)\n-\n \tnew file: dir2/added\n \n Changes not staged for commit:\n (use \"git add ...\" to update what will be committed)\n (use \"git checkout -- ...\" to discard changes in working directory)\n-\n \tmodified: dir1/modified\n \n Untracked files not listed (use -u option to show untracked files)\n@@ -485,18 +470,15 @@ and have 1 and 2 different commits each, respectively.\n \n Changes to be committed:\n (use \"git reset HEAD ...\" to unstage)\n-\n \tnew file: dir2/added\n \n Changes not staged for commit:\n (use \"git add ...\" to update what will be committed)\n (use \"git checkout -- ...\" to discard changes in working directory)\n-\n \tmodified: dir1/modified\n \n Untracked files:\n (use \"git add ...\" to include in what will be committed)\n-\n \tdir1/untracked\n \tdir2/modified\n \tdir2/untracked\n@@ -543,18 +525,15 @@ and have 1 and 2 different commits each, respectively.\n \n Changes to be committed:\n (use \"git reset HEAD ...\" to unstage)\n-\n \tnew file: dir2/added\n \n Changes not staged for commit:\n (use \"git add ...\" to update what will be committed)\n (use \"git checkout -- ...\" to discard changes in working directory)\n-\n \tmodified: dir1/modified\n \n Untracked files:\n (use \"git add ...\" to include in what will be committed)\n-\n \tdir1/untracked\n \tdir2/modified\n \tdir2/untracked\n@@ -606,18 +585,15 @@ and have 1 and 2 different commits each, respectively.\n \n Changes to be committed:\n (use \"git reset HEAD ...\" to unstage)\n-\n \tnew file: ../dir2/added\n \n Changes not staged for commit:\n (use \"git add ...\" to update what will be committed)\n (use \"git checkout -- ...\" to discard changes in working directory)\n-\n \tmodified: modified\n \n Untracked files:\n (use \"git add ...\" to include in what will be committed)\n-\n \tuntracked\n \t../dir2/modified\n \t../dir2/untracked\n@@ -677,18 +653,15 @@ and have 1 and 2 different commits each, respectively.\n \n Changes to be committed:\n (use \"git reset HEAD ...\" to unstage)\n-\n \tnew file: dir2/added\n \n Changes not staged for commit:\n (use \"git add ...\" to update what will be committed)\n (use \"git checkout -- ...\" to discard changes in working directory)\n-\n \tmodified: dir1/modified\n \n Untracked files:\n (use \"git add ...\" to include in what will be committed)\n-\n \tdir1/untracked\n \tdir2/modified\n \tdir2/untracked\n@@ -803,18 +776,15 @@ and have 1 and 2 different commits each, respectively.\n \n Changes to be committed:\n (use \"git reset HEAD ...\" to unstage)\n-\n \tnew file: dir2/added\n \n Changes not staged for commit:\n (use \"git add ...\" to update what will be committed)\n (use \"git checkout -- ...\" to discard changes in working directory)\n-\n \tmodified: dir1/modified\n \n Untracked files:\n (use \"git add ...\" to include in what will be committed)\n-\n \tdir1/untracked\n \tdir2/modified\n \tdir2/untracked\n@@ -853,12 +823,10 @@ and have 1 and 2 different commits each, respectively.\n \n Changes to be committed:\n (use \"git reset HEAD ...\" to unstage)\n-\n \tmodified: dir1/modified\n \n Untracked files:\n (use \"git add ...\" to include in what will be committed)\n-\n \tdir1/untracked\n \tdir2/\n \tuntracked\n@@ -897,19 +865,16 @@ and have 1 and 2 different commits each, respectively.\n \n Changes to be committed:\n (use \"git reset HEAD ...\" to unstage)\n-\n \tnew file: dir2/added\n \tnew file: sm\n \n Changes not staged for commit:\n (use \"git add ...\" to update what will be committed)\n (use \"git checkout -- ...\" to discard changes in working directory)\n-\n \tmodified: dir1/modified\n \n Untracked files:\n (use \"git add ...\" to include in what will be committed)\n-\n \tdir1/untracked\n \tdir2/modified\n \tdir2/untracked\n@@ -957,14 +922,12 @@ and have 1 and 2 different commits each, respectively.\n \n Changes to be committed:\n (use \"git reset HEAD ...\" to unstage)\n-\n \tnew file: dir2/added\n \tnew file: sm\n \n Changes not staged for commit:\n (use \"git add ...\" to update what will be committed)\n (use \"git checkout -- ...\" to discard changes in working directory)\n-\n \tmodified: dir1/modified\n \n Submodule changes to be committed:\n@@ -974,7 +937,6 @@ Submodule changes to be committed:\n \n Untracked files:\n (use \"git add ...\" to include in what will be committed)\n-\n \tdir1/untracked\n \tdir2/modified\n \tdir2/untracked\n@@ -1020,12 +982,10 @@ and have 2 and 2 different commits each, respectively.\n Changes not staged for commit:\n (use \"git add ...\" to update what will be committed)\n (use \"git checkout -- ...\" to discard changes in working directory)\n-\n \tmodified: dir1/modified\n \n Untracked files:\n (use \"git add ...\" to include in what will be committed)\n-\n \tdir1/untracked\n \tdir2/modified\n \tdir2/untracked\n@@ -1069,14 +1029,12 @@ and have 2 and 2 different commits each, respectively.\n \n Changes to be committed:\n (use \"git reset HEAD^1 ...\" to unstage)\n-\n \tnew file: dir2/added\n \tnew file: sm\n \n Changes not staged for commit:\n (use \"git add ...\" to update what will be committed)\n (use \"git checkout -- ...\" to discard changes in working directory)\n-\n \tmodified: dir1/modified\n \n Submodule changes to be committed:\n@@ -1086,7 +1044,6 @@ Submodule changes to be committed:\n \n Untracked files:\n (use \"git add ...\" to include in what will be committed)\n-\n \tdir1/untracked\n \tdir2/modified\n \tdir2/untracked\n@@ -1124,13 +1081,11 @@ and have 2 and 2 different commits each, respectively.\n \n Changes to be committed:\n (use \"git reset HEAD ...\" to unstage)\n-\n \tmodified: sm\n \n Changes not staged for commit:\n (use \"git add ...\" to update what will be committed)\n (use \"git checkout -- ...\" to discard changes in working directory)\n-\n \tmodified: dir1/modified\n \n Submodule changes to be committed:\n@@ -1140,7 +1095,6 @@ Submodule changes to be committed:\n \n Untracked files:\n (use \"git add ...\" to include in what will be committed)\n-\n \t.gitmodules\n \tdir1/untracked\n \tdir2/modified\n@@ -1236,14 +1190,12 @@ and have 2 and 2 different commits each, respectively.\n \n Changes to be committed:\n (use \"git reset HEAD ...\" to unstage)\n-\n \tmodified: sm\n \n Changes not staged for commit:\n (use \"git add ...\" to update what will be committed)\n (use \"git checkout -- ...\" to discard changes in working directory)\n (commit or discard the untracked or modified content in submodules)\n-\n \tmodified: dir1/modified\n \tmodified: sm (modified content)\n \n@@ -1254,7 +1206,6 @@ Submodule changes to be committed:\n \n Untracked files:\n (use \"git add ...\" to include in what will be committed)\n-\n \t.gitmodules\n \tdir1/untracked\n \tdir2/modified\n@@ -1296,13 +1247,11 @@ and have 2 and 2 different commits each, respectively.\n \n Changes to be committed:\n (use \"git reset HEAD ...\" to unstage)\n-\n \tmodified: sm\n \n Changes not staged for commit:\n (use \"git add ...\" to update what will be committed)\n (use \"git checkout -- ...\" to discard changes in working directory)\n-\n \tmodified: dir1/modified\n \tmodified: sm (new commits)\n \n@@ -1318,7 +1267,6 @@ Submodules changed but not updated:\n \n Untracked files:\n (use \"git add ...\" to include in what will be committed)\n-\n \t.gitmodules\n \tdir1/untracked\n \tdir2/modified\n@@ -1380,13 +1328,11 @@ cat > expect << EOF\n ;\n ; Changes to be committed:\n ; (use \"git reset HEAD ...\" to unstage)\n-;\n ;\tmodified: sm\n ;\n ; Changes not staged for commit:\n ; (use \"git add ...\" to update what will be committed)\n ; (use \"git checkout -- ...\" to discard changes in working directory)\n-;\n ;\tmodified: dir1/modified\n ;\tmodified: sm (new commits)\n ;\n@@ -1402,7 +1348,6 @@ cat > expect << EOF\n ;\n ; Untracked files:\n ; (use \"git add ...\" to include in what will be committed)\n-;\n ;\t.gitmodules\n ;\tdir1/untracked\n ;\tdir2/modified\n@@ -1432,12 +1377,10 @@ and have 2 and 2 different commits each, respectively.\n Changes not staged for commit:\n (use \"git add ...\" to update what will be committed)\n (use \"git checkout -- ...\" to discard changes in working directory)\n-\n \tmodified: dir1/modified\n \n Untracked files:\n (use \"git add ...\" to include in what will be committed)\n-\n \t.gitmodules\n \tdir1/untracked\n \tdir2/modified\n@@ -1459,18 +1402,15 @@ and have 2 and 2 different commits each, respectively.\n \n Changes to be committed:\n (use \"git reset HEAD ...\" to unstage)\n-\n \tmodified: sm\n \n Changes not staged for commit:\n (use \"git add ...\" to update what will be committed)\n (use \"git checkout -- ...\" to discard changes in working directory)\n-\n \tmodified: dir1/modified\n \n Untracked files:\n (use \"git add ...\" to include in what will be committed)\n-\n \t.gitmodules\n \tdir1/untracked\n \tdir2/modified\n@@ -1582,13 +1522,11 @@ and have 2 and 2 different commits each, respectively.\n \n Changes to be committed:\n (use \"git reset HEAD ...\" to unstage)\n-\n \tmodified: sm\n \n Changes not staged for commit:\n (use \"git add ...\" to update what will be committed)\n (use \"git checkout -- ...\" to discard changes in working directory)\n-\n \tmodified: dir1/modified\n \n Untracked files not listed (use -u option to show untracked files)\ndiff --git a/t/t7512-status-help.sh b/t/t7512-status-help.sh\nindex c1eb72555d..e5ba2d2c8a 100755\n--- a/t/t7512-status-help.sh\n+++ b/t/t7512-status-help.sh\n@@ -33,7 +33,6 @@ You have unmerged paths.\n \n Unmerged paths:\n (use \"git add ...\" to mark resolution)\n-\n \tboth modified: main.txt\n \n no changes added to commit (use \"git add\" and/or \"git commit -a\")\n@@ -54,7 +53,6 @@ All conflicts fixed but you are still merging.\n (use \"git commit\" to conclude merge)\n \n Changes to be committed:\n-\n \tmodified: main.txt\n \n Untracked files not listed (use -u option to show untracked files)\n@@ -87,7 +85,6 @@ You are currently rebasing branch '\\''rebase_conflicts'\\'' on '\\''$ONTO'\\''.\n Unmerged paths:\n (use \"git reset HEAD ...\" to unstage)\n (use \"git add ...\" to mark resolution)\n-\n \tboth modified: main.txt\n \n no changes added to commit (use \"git add\" and/or \"git commit -a\")\n@@ -111,7 +108,6 @@ You are currently rebasing branch '\\''rebase_conflicts'\\'' on '\\''$ONTO'\\''.\n \n Changes to be committed:\n (use \"git reset HEAD ...\" to unstage)\n-\n \tmodified: main.txt\n \n Untracked files not listed (use -u option to show untracked files)\n@@ -150,7 +146,6 @@ You are currently rebasing branch '\\''rebase_i_conflicts_second'\\'' on '\\''$ONTO\n Unmerged paths:\n (use \"git reset HEAD ...\" to unstage)\n (use \"git add ...\" to mark resolution)\n-\n \tboth modified: main.txt\n \n no changes added to commit (use \"git add\" and/or \"git commit -a\")\n@@ -177,7 +172,6 @@ You are currently rebasing branch '\\''rebase_i_conflicts_second'\\'' on '\\''$ONTO\n \n Changes to be committed:\n (use \"git reset HEAD ...\" to unstage)\n-\n \tmodified: main.txt\n \n Untracked files not listed (use -u option to show untracked files)\n@@ -247,7 +241,6 @@ You are currently splitting a commit while rebasing branch '\\''split_commit'\\''\n Changes not staged for commit:\n (use \"git add ...\" to update what will be committed)\n (use \"git checkout -- ...\" to discard changes in working directory)\n-\n \tmodified: main.txt\n \n no changes added to commit (use \"git add\" and/or \"git commit -a\")\n@@ -355,7 +348,6 @@ You are currently splitting a commit while rebasing branch '\\''several_edits'\\''\n Changes not staged for commit:\n (use \"git add ...\" to update what will be committed)\n (use \"git checkout -- ...\" to discard changes in working directory)\n-\n \tmodified: main.txt\n \n no changes added to commit (use \"git add\" and/or \"git commit -a\")\n@@ -454,7 +446,6 @@ You are currently splitting a commit while rebasing branch '\\''several_edits'\\''\n Changes not staged for commit:\n (use \"git add ...\" to update what will be committed)\n (use \"git checkout -- ...\" to discard changes in working directory)\n-\n \tmodified: main.txt\n \n no changes added to commit (use \"git add\" and/or \"git commit -a\")\n@@ -558,7 +549,6 @@ You are currently splitting a commit while rebasing branch '\\''several_edits'\\''\n Changes not staged for commit:\n (use \"git add ...\" to update what will be committed)\n (use \"git checkout -- ...\" to discard changes in working directory)\n-\n \tmodified: main.txt\n \n no changes added to commit (use \"git add\" and/or \"git commit -a\")\n@@ -747,7 +737,6 @@ You are currently cherry-picking commit $TO_CHERRY_PICK.\n \n Unmerged paths:\n (use \"git add ...\" to mark resolution)\n-\n \tboth modified: main.txt\n \n no changes added to commit (use \"git add\" and/or \"git commit -a\")\n@@ -771,7 +760,6 @@ You are currently cherry-picking commit $TO_CHERRY_PICK.\n (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)\n \n Changes to be committed:\n-\n \tmodified: main.txt\n \n Untracked files not listed (use -u option to show untracked files)\n@@ -836,7 +824,6 @@ You are currently reverting commit $TO_REVERT.\n Unmerged paths:\n (use \"git reset HEAD ...\" to unstage)\n (use \"git add ...\" to mark resolution)\n-\n \tboth modified: to-revert.txt\n \n no changes added to commit (use \"git add\" and/or \"git commit -a\")\n@@ -856,7 +843,6 @@ You are currently reverting commit $TO_REVERT.\n \n Changes to be committed:\n (use \"git reset HEAD ...\" to unstage)\n-\n \tmodified: to-revert.txt\n \n Untracked files not listed (use -u option to show untracked files)\ndiff --git a/wt-status.c b/wt-status.c\nindex e065558c31..3d10d19af0 100644\n--- a/wt-status.c\n+++ b/wt-status.c\n@@ -194,7 +194,6 @@ static void wt_longstatus_print_unmerged_header(struct wt_status *s)\n \t} else {\n \t\tstatus_printf_ln(s, c, _(\" (use \\\"git add/rm ...\\\" as appropriate to mark resolution)\"));\n \t}\n-\tstatus_printf_ln(s, c, \"%s\", \"\");\n }\n \n static void wt_longstatus_print_cached_header(struct wt_status *s)\n@@ -210,7 +209,6 @@ static void wt_longstatus_print_cached_header(struct wt_status *s)\n \t\tstatus_printf_ln(s, c, _(\" (use \\\"git reset %s ...\\\" to unstage)\"), s->reference);\n \telse\n \t\tstatus_printf_ln(s, c, _(\" (use \\\"git rm --cached ...\\\" to unstage)\"));\n-\tstatus_printf_ln(s, c, \"%s\", \"\");\n }\n \n static void wt_longstatus_print_dirty_header(struct wt_status *s,\n@@ -229,7 +227,6 @@ static void wt_longstatus_print_dirty_header(struct wt_status *s,\n \tstatus_printf_ln(s, c, _(\" (use \\\"git checkout -- ...\\\" to discard changes in working directory)\"));\n \tif (has_dirty_submodules)\n \t\tstatus_printf_ln(s, c, _(\" (commit or discard the untracked or modified content in submodules)\"));\n-\tstatus_printf_ln(s, c, \"%s\", \"\");\n }\n \n static void wt_longstatus_print_other_header(struct wt_status *s,\n@@ -241,7 +238,6 @@ static void wt_longstatus_print_other_header(struct wt_status *s,\n \tif (!s->hints)\n \t\treturn;\n \tstatus_printf_ln(s, c, _(\" (use \\\"git %s ...\\\" to include in what will be committed)\"), how);\n-\tstatus_printf_ln(s, c, \"%s\", \"\");\n }\n \n static void wt_longstatus_print_trailer(struct wt_status *s)\n-- \ngitgitgadget\n"},{"id":"376277","messageId":"CAKO26MsGpEcK74CSdgNGjFdKAMDP5Knm+0_vtcnrBBJjBfjcQA@mail.gmail.com","threadId":"51098","inReplyTo":"468be8f85426ccf588ad558fab3c8927ef58627f.1557917642.git.gitgitgadget@gmail.com","subject":"Re: [PATCH 1/1] status: remove the empty line after hints","fromName":"林自均","fromEmail":"johnlinp@gmail.com","sentAt":"2019-05-28T07:42:32Z","receivedAt":"2019-05-28T07:42:46Z","isPatch":true,"sender":{"key":"johnlinp@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1290376?v=4"},"body":"Hi Junio,\n\nJohn Lin via GitGitGadget 於 2019年5月15日 週三 下午6:54寫道：\n>\n> From: John Lin \n>\n> Before this patch, there is inconsistency between the status\n> messages with hints and the ones without hints: there is an\n> empty line between the title and the file list if hints are\n> presented, but there isn't one if there are no hints.\n>\n> This patch remove the inconsistency by removing the empty\n> lines even if hints are presented.\n\nI would like to ask for the final decision on this patch. Thank you.\n\nBest,\nJohn Lin\n\n>\n> Signed-off-by: John Lin \n> ---\n> t/t7060-wtstatus.sh | 5 ----\n> t/t7508-status.sh | 62 ------------------------------------------\n> t/t7512-status-help.sh | 14 ----------\n> wt-status.c | 4 ---\n> 4 files changed, 85 deletions(-)\n>\n> diff --git a/t/t7060-wtstatus.sh b/t/t7060-wtstatus.sh\n> index 53cf42fac1..d5218743e9 100755\n> --- a/t/t7060-wtstatus.sh\n> +++ b/t/t7060-wtstatus.sh\n> @@ -38,7 +38,6 @@ You have unmerged paths.\n>\n> Unmerged paths:\n> (use \"git add/rm ...\" as appropriate to mark resolution)\n> -\n> deleted by us: foo\n>\n> no changes added to commit (use \"git add\" and/or \"git commit -a\")\n> @@ -143,7 +142,6 @@ You have unmerged paths.\n>\n> Unmerged paths:\n> (use \"git add/rm ...\" as appropriate to mark resolution)\n> -\n> both added: conflict.txt\n> deleted by them: main.txt\n>\n> @@ -177,7 +175,6 @@ You have unmerged paths.\n>\n> Unmerged paths:\n> (use \"git add/rm ...\" as appropriate to mark resolution)\n> -\n> both deleted: main.txt\n> added by them: sub_master.txt\n> added by us: sub_second.txt\n> @@ -201,12 +198,10 @@ You have unmerged paths.\n> (use \"git merge --abort\" to abort the merge)\n>\n> Changes to be committed:\n> -\n> new file: sub_master.txt\n>\n> Unmerged paths:\n> (use \"git rm ...\" to mark resolution)\n> -\n> both deleted: main.txt\n>\n> Untracked files not listed (use -u option to show untracked files)\n> diff --git a/t/t7508-status.sh b/t/t7508-status.sh\n> index e1f11293e2..1cb1032c98 100755\n> --- a/t/t7508-status.sh\n> +++ b/t/t7508-status.sh\n> @@ -95,18 +95,15 @@ test_expect_success 'status --column' '\n> #\n> # Changes to be committed:\n> # (use \"git reset HEAD ...\" to unstage)\n> -#\n> # new file: dir2/added\n> #\n> # Changes not staged for commit:\n> # (use \"git add ...\" to update what will be committed)\n> # (use \"git checkout -- ...\" to discard changes in working directory)\n> -#\n> # modified: dir1/modified\n> #\n> # Untracked files:\n> # (use \"git add ...\" to include in what will be committed)\n> -#\n> # dir1/untracked dir2/untracked\n> # dir2/modified untracked\n> #\n> @@ -129,18 +126,15 @@ cat >expect <<\\EOF\n> #\n> # Changes to be committed:\n> # (use \"git reset HEAD ...\" to unstage)\n> -#\n> # new file: dir2/added\n> #\n> # Changes not staged for commit:\n> # (use \"git add ...\" to update what will be committed)\n> # (use \"git checkout -- ...\" to discard changes in working directory)\n> -#\n> # modified: dir1/modified\n> #\n> # Untracked files:\n> # (use \"git add ...\" to include in what will be committed)\n> -#\n> # dir1/untracked\n> # dir2/modified\n> # dir2/untracked\n> @@ -279,23 +273,19 @@ and have 1 and 2 different commits each, respectively.\n>\n> Changes to be committed:\n> (use \"git reset HEAD ...\" to unstage)\n> -\n> new file: dir2/added\n>\n> Changes not staged for commit:\n> (use \"git add ...\" to update what will be committed)\n> (use \"git checkout -- ...\" to discard changes in working directory)\n> -\n> modified: dir1/modified\n>\n> Untracked files:\n> (use \"git add ...\" to include in what will be committed)\n> -\n> dir2/modified\n>\n> Ignored files:\n> (use \"git add -f ...\" to include in what will be committed)\n> -\n> .gitignore\n> dir1/untracked\n> dir2/untracked\n> @@ -348,18 +338,15 @@ and have 1 and 2 different commits each, respectively.\n>\n> Changes to be committed:\n> (use \"git reset HEAD ...\" to unstage)\n> -\n> new file: dir2/added\n>\n> Changes not staged for commit:\n> (use \"git add ...\" to update what will be committed)\n> (use \"git checkout -- ...\" to discard changes in working directory)\n> -\n> modified: dir1/modified\n>\n> Ignored files:\n> (use \"git add -f ...\" to include in what will be committed)\n> -\n> .gitignore\n> dir1/untracked\n> dir2/modified\n> @@ -421,13 +408,11 @@ and have 1 and 2 different commits each, respectively.\n>\n> Changes to be committed:\n> (use \"git reset HEAD ...\" to unstage)\n> -\n> new file: dir2/added\n>\n> Changes not staged for commit:\n> (use \"git add ...\" to update what will be committed)\n> (use \"git checkout -- ...\" to discard changes in working directory)\n> -\n> modified: dir1/modified\n>\n> Untracked files not listed (use -u option to show untracked files)\n> @@ -485,18 +470,15 @@ and have 1 and 2 different commits each, respectively.\n>\n> Changes to be committed:\n> (use \"git reset HEAD ...\" to unstage)\n> -\n> new file: dir2/added\n>\n> Changes not staged for commit:\n> (use \"git add ...\" to update what will be committed)\n> (use \"git checkout -- ...\" to discard changes in working directory)\n> -\n> modified: dir1/modified\n>\n> Untracked files:\n> (use \"git add ...\" to include in what will be committed)\n> -\n> dir1/untracked\n> dir2/modified\n> dir2/untracked\n> @@ -543,18 +525,15 @@ and have 1 and 2 different commits each, respectively.\n>\n> Changes to be committed:\n> (use \"git reset HEAD ...\" to unstage)\n> -\n> new file: dir2/added\n>\n> Changes not staged for commit:\n> (use \"git add ...\" to update what will be committed)\n> (use \"git checkout -- ...\" to discard changes in working directory)\n> -\n> modified: dir1/modified\n>\n> Untracked files:\n> (use \"git add ...\" to include in what will be committed)\n> -\n> dir1/untracked\n> dir2/modified\n> dir2/untracked\n> @@ -606,18 +585,15 @@ and have 1 and 2 different commits each, respectively.\n>\n> Changes to be committed:\n> (use \"git reset HEAD ...\" to unstage)\n> -\n> new file: ../dir2/added\n>\n> Changes not staged for commit:\n> (use \"git add ...\" to update what will be committed)\n> (use \"git checkout -- ...\" to discard changes in working directory)\n> -\n> modified: modified\n>\n> Untracked files:\n> (use \"git add ...\" to include in what will be committed)\n> -\n> untracked\n> ../dir2/modified\n> ../dir2/untracked\n> @@ -677,18 +653,15 @@ and have 1 and 2 different commits each, respectively.\n>\n> Changes to be committed:\n> (use \"git reset HEAD ...\" to unstage)\n> -\n> new file: dir2/added\n>\n> Changes not staged for commit:\n> (use \"git add ...\" to update what will be committed)\n> (use \"git checkout -- ...\" to discard changes in working directory)\n> -\n> modified: dir1/modified\n>\n> Untracked files:\n> (use \"git add ...\" to include in what will be committed)\n> -\n> dir1/untracked\n> dir2/modified\n> dir2/untracked\n> @@ -803,18 +776,15 @@ and have 1 and 2 different commits each, respectively.\n>\n> Changes to be committed:\n> (use \"git reset HEAD ...\" to unstage)\n> -\n> new file: dir2/added\n>\n> Changes not staged for commit:\n> (use \"git add ...\" to update what will be committed)\n> (use \"git checkout -- ...\" to discard changes in working directory)\n> -\n> modified: dir1/modified\n>\n> Untracked files:\n> (use \"git add ...\" to include in what will be committed)\n> -\n> dir1/untracked\n> dir2/modified\n> dir2/untracked\n> @@ -853,12 +823,10 @@ and have 1 and 2 different commits each, respectively.\n>\n> Changes to be committed:\n> (use \"git reset HEAD ...\" to unstage)\n> -\n> modified: dir1/modified\n>\n> Untracked files:\n> (use \"git add ...\" to include in what will be committed)\n> -\n> dir1/untracked\n> dir2/\n> untracked\n> @@ -897,19 +865,16 @@ and have 1 and 2 different commits each, respectively.\n>\n> Changes to be committed:\n> (use \"git reset HEAD ...\" to unstage)\n> -\n> new file: dir2/added\n> new file: sm\n>\n> Changes not staged for commit:\n> (use \"git add ...\" to update what will be committed)\n> (use \"git checkout -- ...\" to discard changes in working directory)\n> -\n> modified: dir1/modified\n>\n> Untracked files:\n> (use \"git add ...\" to include in what will be committed)\n> -\n> dir1/untracked\n> dir2/modified\n> dir2/untracked\n> @@ -957,14 +922,12 @@ and have 1 and 2 different commits each, respectively.\n>\n> Changes to be committed:\n> (use \"git reset HEAD ...\" to unstage)\n> -\n> new file: dir2/added\n> new file: sm\n>\n> Changes not staged for commit:\n> (use \"git add ...\" to update what will be committed)\n> (use \"git checkout -- ...\" to discard changes in working directory)\n> -\n> modified: dir1/modified\n>\n> Submodule changes to be committed:\n> @@ -974,7 +937,6 @@ Submodule changes to be committed:\n>\n> Untracked files:\n> (use \"git add ...\" to include in what will be committed)\n> -\n> dir1/untracked\n> dir2/modified\n> dir2/untracked\n> @@ -1020,12 +982,10 @@ and have 2 and 2 different commits each, respectively.\n> Changes not staged for commit:\n> (use \"git add ...\" to update what will be committed)\n> (use \"git checkout -- ...\" to discard changes in working directory)\n> -\n> modified: dir1/modified\n>\n> Untracked files:\n> (use \"git add ...\" to include in what will be committed)\n> -\n> dir1/untracked\n> dir2/modified\n> dir2/untracked\n> @@ -1069,14 +1029,12 @@ and have 2 and 2 different commits each, respectively.\n>\n> Changes to be committed:\n> (use \"git reset HEAD^1 ...\" to unstage)\n> -\n> new file: dir2/added\n> new file: sm\n>\n> Changes not staged for commit:\n> (use \"git add ...\" to update what will be committed)\n> (use \"git checkout -- ...\" to discard changes in working directory)\n> -\n> modified: dir1/modified\n>\n> Submodule changes to be committed:\n> @@ -1086,7 +1044,6 @@ Submodule changes to be committed:\n>\n> Untracked files:\n> (use \"git add ...\" to include in what will be committed)\n> -\n> dir1/untracked\n> dir2/modified\n> dir2/untracked\n> @@ -1124,13 +1081,11 @@ and have 2 and 2 different commits each, respectively.\n>\n> Changes to be committed:\n> (use \"git reset HEAD ...\" to unstage)\n> -\n> modified: sm\n>\n> Changes not staged for commit:\n> (use \"git add ...\" to update what will be committed)\n> (use \"git checkout -- ...\" to discard changes in working directory)\n> -\n> modified: dir1/modified\n>\n> Submodule changes to be committed:\n> @@ -1140,7 +1095,6 @@ Submodule changes to be committed:\n>\n> Untracked files:\n> (use \"git add ...\" to include in what will be committed)\n> -\n> .gitmodules\n> dir1/untracked\n> dir2/modified\n> @@ -1236,14 +1190,12 @@ and have 2 and 2 different commits each, respectively.\n>\n> Changes to be committed:\n> (use \"git reset HEAD ...\" to unstage)\n> -\n> modified: sm\n>\n> Changes not staged for commit:\n> (use \"git add ...\" to update what will be committed)\n> (use \"git checkout -- ...\" to discard changes in working directory)\n> (commit or discard the untracked or modified content in submodules)\n> -\n> modified: dir1/modified\n> modified: sm (modified content)\n>\n> @@ -1254,7 +1206,6 @@ Submodule changes to be committed:\n>\n> Untracked files:\n> (use \"git add ...\" to include in what will be committed)\n> -\n> .gitmodules\n> dir1/untracked\n> dir2/modified\n> @@ -1296,13 +1247,11 @@ and have 2 and 2 different commits each, respectively.\n>\n> Changes to be committed:\n> (use \"git reset HEAD ...\" to unstage)\n> -\n> modified: sm\n>\n> Changes not staged for commit:\n> (use \"git add ...\" to update what will be committed)\n> (use \"git checkout -- ...\" to discard changes in working directory)\n> -\n> modified: dir1/modified\n> modified: sm (new commits)\n>\n> @@ -1318,7 +1267,6 @@ Submodules changed but not updated:\n>\n> Untracked files:\n> (use \"git add ...\" to include in what will be committed)\n> -\n> .gitmodules\n> dir1/untracked\n> dir2/modified\n> @@ -1380,13 +1328,11 @@ cat > expect << EOF\n> ;\n> ; Changes to be committed:\n> ; (use \"git reset HEAD ...\" to unstage)\n> -;\n> ; modified: sm\n> ;\n> ; Changes not staged for commit:\n> ; (use \"git add ...\" to update what will be committed)\n> ; (use \"git checkout -- ...\" to discard changes in working directory)\n> -;\n> ; modified: dir1/modified\n> ; modified: sm (new commits)\n> ;\n> @@ -1402,7 +1348,6 @@ cat > expect << EOF\n> ;\n> ; Untracked files:\n> ; (use \"git add ...\" to include in what will be committed)\n> -;\n> ; .gitmodules\n> ; dir1/untracked\n> ; dir2/modified\n> @@ -1432,12 +1377,10 @@ and have 2 and 2 different commits each, respectively.\n> Changes not staged for commit:\n> (use \"git add ...\" to update what will be committed)\n> (use \"git checkout -- ...\" to discard changes in working directory)\n> -\n> modified: dir1/modified\n>\n> Untracked files:\n> (use \"git add ...\" to include in what will be committed)\n> -\n> .gitmodules\n> dir1/untracked\n> dir2/modified\n> @@ -1459,18 +1402,15 @@ and have 2 and 2 different commits each, respectively.\n>\n> Changes to be committed:\n> (use \"git reset HEAD ...\" to unstage)\n> -\n> modified: sm\n>\n> Changes not staged for commit:\n> (use \"git add ...\" to update what will be committed)\n> (use \"git checkout -- ...\" to discard changes in working directory)\n> -\n> modified: dir1/modified\n>\n> Untracked files:\n> (use \"git add ...\" to include in what will be committed)\n> -\n> .gitmodules\n> dir1/untracked\n> dir2/modified\n> @@ -1582,13 +1522,11 @@ and have 2 and 2 different commits each, respectively.\n>\n> Changes to be committed:\n> (use \"git reset HEAD ...\" to unstage)\n> -\n> modified: sm\n>\n> Changes not staged for commit:\n> (use \"git add ...\" to update what will be committed)\n> (use \"git checkout -- ...\" to discard changes in working directory)\n> -\n> modified: dir1/modified\n>\n> Untracked files not listed (use -u option to show untracked files)\n> diff --git a/t/t7512-status-help.sh b/t/t7512-status-help.sh\n> index c1eb72555d..e5ba2d2c8a 100755\n> --- a/t/t7512-status-help.sh\n> +++ b/t/t7512-status-help.sh\n> @@ -33,7 +33,6 @@ You have unmerged paths.\n>\n> Unmerged paths:\n> (use \"git add ...\" to mark resolution)\n> -\n> both modified: main.txt\n>\n> no changes added to commit (use \"git add\" and/or \"git commit -a\")\n> @@ -54,7 +53,6 @@ All conflicts fixed but you are still merging.\n> (use \"git commit\" to conclude merge)\n>\n> Changes to be committed:\n> -\n> modified: main.txt\n>\n> Untracked files not listed (use -u option to show untracked files)\n> @@ -87,7 +85,6 @@ You are currently rebasing branch '\\''rebase_conflicts'\\'' on '\\''$ONTO'\\''.\n> Unmerged paths:\n> (use \"git reset HEAD ...\" to unstage)\n> (use \"git add ...\" to mark resolution)\n> -\n> both modified: main.txt\n>\n> no changes added to commit (use \"git add\" and/or \"git commit -a\")\n> @@ -111,7 +108,6 @@ You are currently rebasing branch '\\''rebase_conflicts'\\'' on '\\''$ONTO'\\''.\n>\n> Changes to be committed:\n> (use \"git reset HEAD ...\" to unstage)\n> -\n> modified: main.txt\n>\n> Untracked files not listed (use -u option to show untracked files)\n> @@ -150,7 +146,6 @@ You are currently rebasing branch '\\''rebase_i_conflicts_second'\\'' on '\\''$ONTO\n> Unmerged paths:\n> (use \"git reset HEAD ...\" to unstage)\n> (use \"git add ...\" to mark resolution)\n> -\n> both modified: main.txt\n>\n> no changes added to commit (use \"git add\" and/or \"git commit -a\")\n> @@ -177,7 +172,6 @@ You are currently rebasing branch '\\''rebase_i_conflicts_second'\\'' on '\\''$ONTO\n>\n> Changes to be committed:\n> (use \"git reset HEAD ...\" to unstage)\n> -\n> modified: main.txt\n>\n> Untracked files not listed (use -u option to show untracked files)\n> @@ -247,7 +241,6 @@ You are currently splitting a commit while rebasing branch '\\''split_commit'\\''\n> Changes not staged for commit:\n> (use \"git add ...\" to update what will be committed)\n> (use \"git checkout -- ...\" to discard changes in working directory)\n> -\n> modified: main.txt\n>\n> no changes added to commit (use \"git add\" and/or \"git commit -a\")\n> @@ -355,7 +348,6 @@ You are currently splitting a commit while rebasing branch '\\''several_edits'\\''\n> Changes not staged for commit:\n> (use \"git add ...\" to update what will be committed)\n> (use \"git checkout -- ...\" to discard changes in working directory)\n> -\n> modified: main.txt\n>\n> no changes added to commit (use \"git add\" and/or \"git commit -a\")\n> @@ -454,7 +446,6 @@ You are currently splitting a commit while rebasing branch '\\''several_edits'\\''\n> Changes not staged for commit:\n> (use \"git add ...\" to update what will be committed)\n> (use \"git checkout -- ...\" to discard changes in working directory)\n> -\n> modified: main.txt\n>\n> no changes added to commit (use \"git add\" and/or \"git commit -a\")\n> @@ -558,7 +549,6 @@ You are currently splitting a commit while rebasing branch '\\''several_edits'\\''\n> Changes not staged for commit:\n> (use \"git add ...\" to update what will be committed)\n> (use \"git checkout -- ...\" to discard changes in working directory)\n> -\n> modified: main.txt\n>\n> no changes added to commit (use \"git add\" and/or \"git commit -a\")\n> @@ -747,7 +737,6 @@ You are currently cherry-picking commit $TO_CHERRY_PICK.\n>\n> Unmerged paths:\n> (use \"git add ...\" to mark resolution)\n> -\n> both modified: main.txt\n>\n> no changes added to commit (use \"git add\" and/or \"git commit -a\")\n> @@ -771,7 +760,6 @@ You are currently cherry-picking commit $TO_CHERRY_PICK.\n> (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)\n>\n> Changes to be committed:\n> -\n> modified: main.txt\n>\n> Untracked files not listed (use -u option to show untracked files)\n> @@ -836,7 +824,6 @@ You are currently reverting commit $TO_REVERT.\n> Unmerged paths:\n> (use \"git reset HEAD ...\" to unstage)\n> (use \"git add ...\" to mark resolution)\n> -\n> both modified: to-revert.txt\n>\n> no changes added to commit (use \"git add\" and/or \"git commit -a\")\n> @@ -856,7 +843,6 @@ You are currently reverting commit $TO_REVERT.\n>\n> Changes to be committed:\n> (use \"git reset HEAD ...\" to unstage)\n> -\n> modified: to-revert.txt\n>\n> Untracked files not listed (use -u option to show untracked files)\n> diff --git a/wt-status.c b/wt-status.c\n> index e065558c31..3d10d19af0 100644\n> --- a/wt-status.c\n> +++ b/wt-status.c\n> @@ -194,7 +194,6 @@ static void wt_longstatus_print_unmerged_header(struct wt_status *s)\n> } else {\n> status_printf_ln(s, c, _(\" (use \\\"git add/rm ...\\\" as appropriate to mark resolution)\"));\n> }\n> - status_printf_ln(s, c, \"%s\", \"\");\n> }\n>\n> static void wt_longstatus_print_cached_header(struct wt_status *s)\n> @@ -210,7 +209,6 @@ static void wt_longstatus_print_cached_header(struct wt_status *s)\n> status_printf_ln(s, c, _(\" (use \\\"git reset %s ...\\\" to unstage)\"), s->reference);\n> else\n> status_printf_ln(s, c, _(\" (use \\\"git rm --cached ...\\\" to unstage)\"));\n> - status_printf_ln(s, c, \"%s\", \"\");\n> }\n>\n> static void wt_longstatus_print_dirty_header(struct wt_status *s,\n> @@ -229,7 +227,6 @@ static void wt_longstatus_print_dirty_header(struct wt_status *s,\n> status_printf_ln(s, c, _(\" (use \\\"git checkout -- ...\\\" to discard changes in working directory)\"));\n> if (has_dirty_submodules)\n> status_printf_ln(s, c, _(\" (commit or discard the untracked or modified content in submodules)\"));\n> - status_printf_ln(s, c, \"%s\", \"\");\n> }\n>\n> static void wt_longstatus_print_other_header(struct wt_status *s,\n> @@ -241,7 +238,6 @@ static void wt_longstatus_print_other_header(struct wt_status *s,\n> if (!s->hints)\n> return;\n> status_printf_ln(s, c, _(\" (use \\\"git %s ...\\\" to include in what will be committed)\"), how);\n> - status_printf_ln(s, c, \"%s\", \"\");\n> }\n>\n> static void wt_longstatus_print_trailer(struct wt_status *s)\n> --\n> gitgitgadget\n"},{"id":"376351","messageId":"xmqq36ky1fe8.fsf@gitster-ct.c.googlers.com","threadId":"51098","inReplyTo":"CAKO26MsGpEcK74CSdgNGjFdKAMDP5Knm+0_vtcnrBBJjBfjcQA@mail.gmail.com","subject":"Re: [PATCH 1/1] status: remove the empty line after hints","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2019-05-28T20:40:47Z","receivedAt":"2019-05-28T20:40:52Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"林自均 writes:\n\n> Hi Junio,\n>\n> John Lin via GitGitGadget 於 2019年5月15日 週三 下午6:54寫道：\n>>\n>> From: John Lin \n>>\n>> Before this patch, there is inconsistency between the status\n>> messages with hints and the ones without hints: there is an\n>> empty line between the title and the file list if hints are\n>> presented, but there isn't one if there are no hints.\n>>\n>> This patch remove the inconsistency by removing the empty\n>> lines even if hints are presented.\n>\n> I would like to ask for the final decision on this patch. Thank you.\n\nIf I recall correctly, the test part of this patch conflicts badly\nwith a topic in flight that splits 'checkout' into 'restore' and\n'switch', which is a more important topic between the two. So if I\nmust give _the final_ decision, then we need to drop this patch, but\nI'd rather not ;-)\n\nDoing this change on top of the switch/restore topic, once it\nstabilized more and graduated to 'master', would be the best course\nof action, I would think.\n\nThanks.\n"},{"id":"376373","messageId":"CAKO26Ms6_rJfq6knh14H1O-V2_6v8YxYdjah0vTdvpJTc7hdXw@mail.gmail.com","threadId":"51098","inReplyTo":"xmqq36ky1fe8.fsf@gitster-ct.c.googlers.com","subject":"Re: [PATCH 1/1] status: remove the empty line after hints","fromName":"林自均","fromEmail":"johnlinp@gmail.com","sentAt":"2019-05-28T23:08:26Z","receivedAt":"2019-05-28T23:08:40Z","isPatch":true,"sender":{"key":"johnlinp@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1290376?v=4"},"body":"Hi Junio,\n\nJunio C Hamano 於 2019年5月29日 週三 上午4:41寫道：\n>\n> 林自均 writes:\n>\n> > Hi Junio,\n> >\n> > John Lin via GitGitGadget 於 2019年5月15日 週三 下午6:54寫道：\n> >>\n> >> From: John Lin \n> >>\n> >> Before this patch, there is inconsistency between the status\n> >> messages with hints and the ones without hints: there is an\n> >> empty line between the title and the file list if hints are\n> >> presented, but there isn't one if there are no hints.\n> >>\n> >> This patch remove the inconsistency by removing the empty\n> >> lines even if hints are presented.\n> >\n> > I would like to ask for the final decision on this patch. Thank you.\n>\n> If I recall correctly, the test part of this patch conflicts badly\n> with a topic in flight that splits 'checkout' into 'restore' and\n> 'switch', which is a more important topic between the two. So if I\n> must give _the final_ decision, then we need to drop this patch, but\n> I'd rather not ;-)\n>\n> Doing this change on top of the switch/restore topic, once it\n> stabilized more and graduated to 'master', would be the best course\n> of action, I would think.\n>\n> Thanks.\n\nI see. Thanks for your kind explanation. I'll wait for the\nswitch/restore topic to merge into master.\n\nBest,\nJohn Lin\n"},{"id":"376393","messageId":"nycvar.QRO.7.76.6.1905291349360.44@tvgsbejvaqbjf.bet","threadId":"51098","inReplyTo":"CAKO26Ms6_rJfq6knh14H1O-V2_6v8YxYdjah0vTdvpJTc7hdXw@mail.gmail.com","subject":"Re: [PATCH 1/1] status: remove the empty line after hints","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2019-05-29T11:51:19Z","receivedAt":"2019-05-29T11:51:43Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi John Lin,\n\nOn Wed, 29 May 2019, 林自均 wrote:\n\n> Junio C Hamano 於 2019年5月29日 週三 上午4:41寫道：\n> >\n> > 林自均 writes:\n> >\n> > > John Lin via GitGitGadget 於 2019年5月15日 週三 下午6:54寫道：\n> > >>\n> > >> From: John Lin \n> > >>\n> > >> Before this patch, there is inconsistency between the status\n> > >> messages with hints and the ones without hints: there is an\n> > >> empty line between the title and the file list if hints are\n> > >> presented, but there isn't one if there are no hints.\n> > >>\n> > >> This patch remove the inconsistency by removing the empty\n> > >> lines even if hints are presented.\n> > >\n> > > I would like to ask for the final decision on this patch. Thank you.\n> >\n> > If I recall correctly, the test part of this patch conflicts badly\n> > with a topic in flight that splits 'checkout' into 'restore' and\n> > 'switch', which is a more important topic between the two. So if I\n> > must give _the final_ decision, then we need to drop this patch, but\n> > I'd rather not ;-)\n> >\n> > Doing this change on top of the switch/restore topic, once it\n> > stabilized more and graduated to 'master', would be the best course\n> > of action, I would think.\n> >\n> > Thanks.\n>\n> I see. Thanks for your kind explanation. I'll wait for the\n> switch/restore topic to merge into master.\n\nYou could already rebase it on top of\nhttps://github.com/gitgitgadget/git/tree/nd/switch-and-restore, say so in\nyour cover letter, and send a new iteration.\n\nCiao,\nJohannes\n"},{"id":"376528","messageId":"CAKO26MtvBRo76TenubyeVNkeA6e5yrS4DZFSLG1ByztP7mMVXw@mail.gmail.com","threadId":"51098","inReplyTo":"nycvar.QRO.7.76.6.1905291349360.44@tvgsbejvaqbjf.bet","subject":"Re: [PATCH 1/1] status: remove the empty line after hints","fromName":"林自均","fromEmail":"johnlinp@gmail.com","sentAt":"2019-06-01T01:12:32Z","receivedAt":"2019-06-01T01:12:51Z","isPatch":true,"sender":{"key":"johnlinp@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1290376?v=4"},"body":"Hi Johannes,\n\nJohannes Schindelin 於 2019年5月29日 週三 下午7:51寫道：\n>\n> Hi John Lin,\n>\n> You could already rebase it on top of\n> https://github.com/gitgitgadget/git/tree/nd/switch-and-restore, say so in\n> your cover letter, and send a new iteration.\n\nThanks for the suggestion. I already rebase on your\nnd/switch-and-restore: https://github.com/gitgitgadget/git/pull/196\nHowever, it seems to have some conflict with the master branch and\ngitgitgadget refused to submit the patch. So I guess I still have to\nwait for the nd/switch-and-restore to resolve the conflict.\n\nBest,\nJohn Lin\n"},{"id":"376568","messageId":"nycvar.QRO.7.76.6.1906031614020.48@tvgsbejvaqbjf.bet","threadId":"51098","inReplyTo":"CAKO26MtvBRo76TenubyeVNkeA6e5yrS4DZFSLG1ByztP7mMVXw@mail.gmail.com","subject":"Re: [PATCH 1/1] status: remove the empty line after hints","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2019-06-03T14:17:47Z","receivedAt":"2019-06-03T14:17:48Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi John Lin,\n\nOn Sat, 1 Jun 2019, 林自均 wrote:\n\n> Johannes Schindelin 於 2019年5月29日 週三\n> 下午7:51寫道：\n> >\n> > You could already rebase it on top of\n> > https://github.com/gitgitgadget/git/tree/nd/switch-and-restore, say so in\n> > your cover letter, and send a new iteration.\n>\n> Thanks for the suggestion. I already rebase on your\n> nd/switch-and-restore: https://github.com/gitgitgadget/git/pull/196\n> However, it seems to have some conflict with the master branch and\n> gitgitgadget refused to submit the patch. So I guess I still have to\n> wait for the nd/switch-and-restore to resolve the conflict.\n\nI am so sorry for being so sloppy. I should have said explicitly what I\nhad in mind: target the nd/switch-and-restore branch.\n\nThe GitGitGadget fork mirrors not only maint, master, next and pu, but\nalso the individual branches that Junio merges into pu (which are\npublished at https://github.com/gitster/git). That is, you can click the\nEdit button next to your PR description, and instead of editing the PR\ndescription, choose a different target branch from the drop-down box below\nit.\n\nSince it was totally my mistake for not telling you this explicitly, I\nallowed myself to do exactly this for you. The Azure Pipeline is running\nas we speak.\n\nThanks & my apologies,\nJohannes\n"},{"id":"376572","messageId":"CAKO26MugSimxd+fiXR7CjT1uRsWXZ=s_a=ebtZmpSDyGg3HTgA@mail.gmail.com","threadId":"51098","inReplyTo":"nycvar.QRO.7.76.6.1906031614020.48@tvgsbejvaqbjf.bet","subject":"Re: [PATCH 1/1] status: remove the empty line after hints","fromName":"林自均","fromEmail":"johnlinp@gmail.com","sentAt":"2019-06-03T15:06:22Z","receivedAt":"2019-06-03T15:06:36Z","isPatch":true,"sender":{"key":"johnlinp@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1290376?v=4"},"body":"Hi Johannes,\n\nThank you for your kind and detailed explanation. I really appreciate\nthat. By the way, I just saw it passed all the Azure Pipeline checks.\nPlease consider merging it into nd/switch-and-restore. Thank you.\n\nBest,\nJohn Lin\n\nJohannes Schindelin 於 2019年6月3日 週一 下午10:17寫道：\n>\n> Hi John Lin,\n>\n> On Sat, 1 Jun 2019, 林自均 wrote:\n>\n> > Johannes Schindelin 於 2019年5月29日 週三\n> > 下午7:51寫道：\n> > >\n> > > You could already rebase it on top of\n> > > https://github.com/gitgitgadget/git/tree/nd/switch-and-restore, say so in\n> > > your cover letter, and send a new iteration.\n> >\n> > Thanks for the suggestion. I already rebase on your\n> > nd/switch-and-restore: https://github.com/gitgitgadget/git/pull/196\n> > However, it seems to have some conflict with the master branch and\n> > gitgitgadget refused to submit the patch. So I guess I still have to\n> > wait for the nd/switch-and-restore to resolve the conflict.\n>\n> I am so sorry for being so sloppy. I should have said explicitly what I\n> had in mind: target the nd/switch-and-restore branch.\n>\n> The GitGitGadget fork mirrors not only maint, master, next and pu, but\n> also the individual branches that Junio merges into pu (which are\n> published at https://github.com/gitster/git). That is, you can click the\n> Edit button next to your PR description, and instead of editing the PR\n> description, choose a different target branch from the drop-down box below\n> it.\n>\n> Since it was totally my mistake for not telling you this explicitly, I\n> allowed myself to do exactly this for you. The Azure Pipeline is running\n> as we speak.\n>\n> Thanks & my apologies,\n> Johannes\n"},{"id":"376654","messageId":"nycvar.QRO.7.76.6.1906041536240.1775@tvgsbejvaqbjf.bet","threadId":"51098","inReplyTo":"CAKO26MugSimxd+fiXR7CjT1uRsWXZ=s_a=ebtZmpSDyGg3HTgA@mail.gmail.com","subject":"Re: [PATCH 1/1] status: remove the empty line after hints","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2019-06-04T13:37:06Z","receivedAt":"2019-06-04T13:37:31Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi John Lin,\n\nOn Mon, 3 Jun 2019, 林自均 wrote:\n\n> Thank you for your kind and detailed explanation. I really appreciate\n> that. By the way, I just saw it passed all the Azure Pipeline checks.\n> Please consider merging it into nd/switch-and-restore. Thank you.\n\nCould you issue a new `/submit`, now that everything is clear? That should\nsend a new iteration of your patch to the mailing list for review.\n\nThanks,\nJohannes\n\n> Johannes Schindelin 於 2019年6月3日 週一 下午10:17寫道：\n> >\n> > Hi John Lin,\n> >\n> > On Sat, 1 Jun 2019, 林自均 wrote:\n> >\n> > > Johannes Schindelin 於 2019年5月29日 週三\n> > > 下午7:51寫道：\n> > > >\n> > > > You could already rebase it on top of\n> > > > https://github.com/gitgitgadget/git/tree/nd/switch-and-restore, say so in\n> > > > your cover letter, and send a new iteration.\n> > >\n> > > Thanks for the suggestion. I already rebase on your\n> > > nd/switch-and-restore: https://github.com/gitgitgadget/git/pull/196\n> > > However, it seems to have some conflict with the master branch and\n> > > gitgitgadget refused to submit the patch. So I guess I still have to\n> > > wait for the nd/switch-and-restore to resolve the conflict.\n> >\n> > I am so sorry for being so sloppy. I should have said explicitly what I\n> > had in mind: target the nd/switch-and-restore branch.\n> >\n> > The GitGitGadget fork mirrors not only maint, master, next and pu, but\n> > also the individual branches that Junio merges into pu (which are\n> > published at https://github.com/gitster/git). That is, you can click the\n> > Edit button next to your PR description, and instead of editing the PR\n> > description, choose a different target branch from the drop-down box below\n> > it.\n> >\n> > Since it was totally my mistake for not telling you this explicitly, I\n> > allowed myself to do exactly this for you. The Azure Pipeline is running\n> > as we speak.\n> >\n> > Thanks & my apologies,\n> > Johannes\n>\n"},{"id":"376657","messageId":"pull.196.v2.git.gitgitgadget@gmail.com","threadId":"51098","inReplyTo":"pull.196.git.gitgitgadget@gmail.com","subject":"[PATCH v2 0/1] status: remove the empty line after hints","fromName":"John Lin via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2019-06-04T14:02:20Z","receivedAt":"2019-06-04T14:02:25Z","isPatch":true,"sender":{"key":"johnlinp@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1290376?v=4"},"body":"Before this patch, there is inconsistency between the status messages with\nhints and the ones without hints: there is an empty line between the title\nand the file list if hints are presented, but there isn't one if there are\nno hints.\n\nThis patch remove the inconsistency by removing the empty lines even if\nhints are presented.\n\nJohn Lin (1):\n status: remove the empty line after hints\n\n t/t7060-wtstatus.sh | 5 ----\n t/t7508-status.sh | 62 ------------------------------------------\n t/t7512-status-help.sh | 14 ----------\n wt-status.c | 4 ---\n 4 files changed, 85 deletions(-)\n\n\nbase-commit: 4e43b7ff1ea4b6f16b93a432b6718e9ab38749bd\nPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-196%2Fjohnlinp%2Ffix-status-empty-line-v2\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-196/johnlinp/fix-status-empty-line-v2\nPull-Request: https://github.com/gitgitgadget/git/pull/196\n\nRange-diff vs v1:\n\n 1: 468be8f854 ! 1: 7dfb9a4b1a status: remove the empty line after hints\n @@ -59,13 +59,13 @@\n @@\n #\n # Changes to be committed:\n - # (use \"git reset HEAD ...\" to unstage)\n + # (use \"git restore --staged ...\" to unstage)\n -#\n #\tnew file: dir2/added\n #\n # Changes not staged for commit:\n # (use \"git add ...\" to update what will be committed)\n - # (use \"git checkout -- ...\" to discard changes in working directory)\n + # (use \"git restore ...\" to discard changes in working directory)\n -#\n #\tmodified: dir1/modified\n #\n @@ -78,13 +78,13 @@\n @@\n #\n # Changes to be committed:\n - # (use \"git reset HEAD ...\" to unstage)\n + # (use \"git restore --staged ...\" to unstage)\n -#\n #\tnew file: dir2/added\n #\n # Changes not staged for commit:\n # (use \"git add ...\" to update what will be committed)\n - # (use \"git checkout -- ...\" to discard changes in working directory)\n + # (use \"git restore ...\" to discard changes in working directory)\n -#\n #\tmodified: dir1/modified\n #\n @@ -97,13 +97,13 @@\n @@\n \n Changes to be committed:\n - (use \"git reset HEAD ...\" to unstage)\n + (use \"git restore --staged ...\" to unstage)\n -\n \tnew file: dir2/added\n \n Changes not staged for commit:\n (use \"git add ...\" to update what will be committed)\n - (use \"git checkout -- ...\" to discard changes in working directory)\n + (use \"git restore ...\" to discard changes in working directory)\n -\n \tmodified: dir1/modified\n \n @@ -121,13 +121,13 @@\n @@\n \n Changes to be committed:\n - (use \"git reset HEAD ...\" to unstage)\n + (use \"git restore --staged ...\" to unstage)\n -\n \tnew file: dir2/added\n \n Changes not staged for commit:\n (use \"git add ...\" to update what will be committed)\n - (use \"git checkout -- ...\" to discard changes in working directory)\n + (use \"git restore ...\" to discard changes in working directory)\n -\n \tmodified: dir1/modified\n \n @@ -140,13 +140,13 @@\n @@\n \n Changes to be committed:\n - (use \"git reset HEAD ...\" to unstage)\n + (use \"git restore --staged ...\" to unstage)\n -\n \tnew file: dir2/added\n \n Changes not staged for commit:\n (use \"git add ...\" to update what will be committed)\n - (use \"git checkout -- ...\" to discard changes in working directory)\n + (use \"git restore ...\" to discard changes in working directory)\n -\n \tmodified: dir1/modified\n \n @@ -154,13 +154,13 @@\n @@\n \n Changes to be committed:\n - (use \"git reset HEAD ...\" to unstage)\n + (use \"git restore --staged ...\" to unstage)\n -\n \tnew file: dir2/added\n \n Changes not staged for commit:\n (use \"git add ...\" to update what will be committed)\n - (use \"git checkout -- ...\" to discard changes in working directory)\n + (use \"git restore ...\" to discard changes in working directory)\n -\n \tmodified: dir1/modified\n \n @@ -173,13 +173,13 @@\n @@\n \n Changes to be committed:\n - (use \"git reset HEAD ...\" to unstage)\n + (use \"git restore --staged ...\" to unstage)\n -\n \tnew file: dir2/added\n \n Changes not staged for commit:\n (use \"git add ...\" to update what will be committed)\n - (use \"git checkout -- ...\" to discard changes in working directory)\n + (use \"git restore ...\" to discard changes in working directory)\n -\n \tmodified: dir1/modified\n \n @@ -192,13 +192,13 @@\n @@\n \n Changes to be committed:\n - (use \"git reset HEAD ...\" to unstage)\n + (use \"git restore --staged ...\" to unstage)\n -\n \tnew file: ../dir2/added\n \n Changes not staged for commit:\n (use \"git add ...\" to update what will be committed)\n - (use \"git checkout -- ...\" to discard changes in working directory)\n + (use \"git restore ...\" to discard changes in working directory)\n -\n \tmodified: modified\n \n @@ -211,13 +211,13 @@\n @@\n \n Changes to be committed:\n - (use \"git reset HEAD ...\" to unstage)\n + (use \"git restore --staged ...\" to unstage)\n -\n \tnew file: dir2/added\n \n Changes not staged for commit:\n (use \"git add ...\" to update what will be committed)\n - (use \"git checkout -- ...\" to discard changes in working directory)\n + (use \"git restore ...\" to discard changes in working directory)\n -\n \tmodified: dir1/modified\n \n @@ -230,13 +230,13 @@\n @@\n \n Changes to be committed:\n - (use \"git reset HEAD ...\" to unstage)\n + (use \"git restore --staged ...\" to unstage)\n -\n \tnew file: dir2/added\n \n Changes not staged for commit:\n (use \"git add ...\" to update what will be committed)\n - (use \"git checkout -- ...\" to discard changes in working directory)\n + (use \"git restore ...\" to discard changes in working directory)\n -\n \tmodified: dir1/modified\n \n @@ -249,7 +249,7 @@\n @@\n \n Changes to be committed:\n - (use \"git reset HEAD ...\" to unstage)\n + (use \"git restore --staged ...\" to unstage)\n -\n \tmodified: dir1/modified\n \n @@ -262,14 +262,14 @@\n @@\n \n Changes to be committed:\n - (use \"git reset HEAD ...\" to unstage)\n + (use \"git restore --staged ...\" to unstage)\n -\n \tnew file: dir2/added\n \tnew file: sm\n \n Changes not staged for commit:\n (use \"git add ...\" to update what will be committed)\n - (use \"git checkout -- ...\" to discard changes in working directory)\n + (use \"git restore ...\" to discard changes in working directory)\n -\n \tmodified: dir1/modified\n \n @@ -282,14 +282,14 @@\n @@\n \n Changes to be committed:\n - (use \"git reset HEAD ...\" to unstage)\n + (use \"git restore --staged ...\" to unstage)\n -\n \tnew file: dir2/added\n \tnew file: sm\n \n Changes not staged for commit:\n (use \"git add ...\" to update what will be committed)\n - (use \"git checkout -- ...\" to discard changes in working directory)\n + (use \"git restore ...\" to discard changes in working directory)\n -\n \tmodified: dir1/modified\n \n @@ -305,7 +305,7 @@\n @@\n Changes not staged for commit:\n (use \"git add ...\" to update what will be committed)\n - (use \"git checkout -- ...\" to discard changes in working directory)\n + (use \"git restore ...\" to discard changes in working directory)\n -\n \tmodified: dir1/modified\n \n @@ -318,14 +318,14 @@\n @@\n \n Changes to be committed:\n - (use \"git reset HEAD^1 ...\" to unstage)\n + (use \"git restore --source=HEAD^1 --staged ...\" to unstage)\n -\n \tnew file: dir2/added\n \tnew file: sm\n \n Changes not staged for commit:\n (use \"git add ...\" to update what will be committed)\n - (use \"git checkout -- ...\" to discard changes in working directory)\n + (use \"git restore ...\" to discard changes in working directory)\n -\n \tmodified: dir1/modified\n \n @@ -341,13 +341,13 @@\n @@\n \n Changes to be committed:\n - (use \"git reset HEAD ...\" to unstage)\n + (use \"git restore --staged ...\" to unstage)\n -\n \tmodified: sm\n \n Changes not staged for commit:\n (use \"git add ...\" to update what will be committed)\n - (use \"git checkout -- ...\" to discard changes in working directory)\n + (use \"git restore ...\" to discard changes in working directory)\n -\n \tmodified: dir1/modified\n \n @@ -363,13 +363,13 @@\n @@\n \n Changes to be committed:\n - (use \"git reset HEAD ...\" to unstage)\n + (use \"git restore --staged ...\" to unstage)\n -\n \tmodified: sm\n \n Changes not staged for commit:\n (use \"git add ...\" to update what will be committed)\n - (use \"git checkout -- ...\" to discard changes in working directory)\n + (use \"git restore ...\" to discard changes in working directory)\n (commit or discard the untracked or modified content in submodules)\n -\n \tmodified: dir1/modified\n @@ -386,13 +386,13 @@\n @@\n \n Changes to be committed:\n - (use \"git reset HEAD ...\" to unstage)\n + (use \"git restore --staged ...\" to unstage)\n -\n \tmodified: sm\n \n Changes not staged for commit:\n (use \"git add ...\" to update what will be committed)\n - (use \"git checkout -- ...\" to discard changes in working directory)\n + (use \"git restore ...\" to discard changes in working directory)\n -\n \tmodified: dir1/modified\n \tmodified: sm (new commits)\n @@ -408,13 +408,13 @@\n @@\n ;\n ; Changes to be committed:\n - ; (use \"git reset HEAD ...\" to unstage)\n + ; (use \"git restore --staged ...\" to unstage)\n -;\n ;\tmodified: sm\n ;\n ; Changes not staged for commit:\n ; (use \"git add ...\" to update what will be committed)\n - ; (use \"git checkout -- ...\" to discard changes in working directory)\n + ; (use \"git restore ...\" to discard changes in working directory)\n -;\n ;\tmodified: dir1/modified\n ;\tmodified: sm (new commits)\n @@ -430,7 +430,7 @@\n @@\n Changes not staged for commit:\n (use \"git add ...\" to update what will be committed)\n - (use \"git checkout -- ...\" to discard changes in working directory)\n + (use \"git restore ...\" to discard changes in working directory)\n -\n \tmodified: dir1/modified\n \n @@ -443,13 +443,13 @@\n @@\n \n Changes to be committed:\n - (use \"git reset HEAD ...\" to unstage)\n + (use \"git restore --staged ...\" to unstage)\n -\n \tmodified: sm\n \n Changes not staged for commit:\n (use \"git add ...\" to update what will be committed)\n - (use \"git checkout -- ...\" to discard changes in working directory)\n + (use \"git restore ...\" to discard changes in working directory)\n -\n \tmodified: dir1/modified\n \n @@ -462,13 +462,13 @@\n @@\n \n Changes to be committed:\n - (use \"git reset HEAD ...\" to unstage)\n + (use \"git restore --staged ...\" to unstage)\n -\n \tmodified: sm\n \n Changes not staged for commit:\n (use \"git add ...\" to update what will be committed)\n - (use \"git checkout -- ...\" to discard changes in working directory)\n + (use \"git restore ...\" to discard changes in working directory)\n -\n \tmodified: dir1/modified\n \n @@ -495,7 +495,7 @@\n Untracked files not listed (use -u option to show untracked files)\n @@\n Unmerged paths:\n - (use \"git reset HEAD ...\" to unstage)\n + (use \"git restore --staged ...\" to unstage)\n (use \"git add ...\" to mark resolution)\n -\n \tboth modified: main.txt\n @@ -504,14 +504,14 @@\n @@\n \n Changes to be committed:\n - (use \"git reset HEAD ...\" to unstage)\n + (use \"git restore --staged ...\" to unstage)\n -\n \tmodified: main.txt\n \n Untracked files not listed (use -u option to show untracked files)\n @@\n Unmerged paths:\n - (use \"git reset HEAD ...\" to unstage)\n + (use \"git restore --staged ...\" to unstage)\n (use \"git add ...\" to mark resolution)\n -\n \tboth modified: main.txt\n @@ -520,7 +520,7 @@\n @@\n \n Changes to be committed:\n - (use \"git reset HEAD ...\" to unstage)\n + (use \"git restore --staged ...\" to unstage)\n -\n \tmodified: main.txt\n \n @@ -528,7 +528,7 @@\n @@\n Changes not staged for commit:\n (use \"git add ...\" to update what will be committed)\n - (use \"git checkout -- ...\" to discard changes in working directory)\n + (use \"git restore ...\" to discard changes in working directory)\n -\n \tmodified: main.txt\n \n @@ -536,7 +536,7 @@\n @@\n Changes not staged for commit:\n (use \"git add ...\" to update what will be committed)\n - (use \"git checkout -- ...\" to discard changes in working directory)\n + (use \"git restore ...\" to discard changes in working directory)\n -\n \tmodified: main.txt\n \n @@ -544,7 +544,7 @@\n @@\n Changes not staged for commit:\n (use \"git add ...\" to update what will be committed)\n - (use \"git checkout -- ...\" to discard changes in working directory)\n + (use \"git restore ...\" to discard changes in working directory)\n -\n \tmodified: main.txt\n \n @@ -552,7 +552,7 @@\n @@\n Changes not staged for commit:\n (use \"git add ...\" to update what will be committed)\n - (use \"git checkout -- ...\" to discard changes in working directory)\n + (use \"git restore ...\" to discard changes in working directory)\n -\n \tmodified: main.txt\n \n @@ -575,7 +575,7 @@\n Untracked files not listed (use -u option to show untracked files)\n @@\n Unmerged paths:\n - (use \"git reset HEAD ...\" to unstage)\n + (use \"git restore --staged ...\" to unstage)\n (use \"git add ...\" to mark resolution)\n -\n \tboth modified: to-revert.txt\n @@ -584,7 +584,7 @@\n @@\n \n Changes to be committed:\n - (use \"git reset HEAD ...\" to unstage)\n + (use \"git restore --staged ...\" to unstage)\n -\n \tmodified: to-revert.txt\n \n @@ -602,15 +602,15 @@\n \n static void wt_longstatus_print_cached_header(struct wt_status *s)\n @@\n - \t\tstatus_printf_ln(s, c, _(\" (use \\\"git reset %s ...\\\" to unstage)\"), s->reference);\n - \telse\n + \t\t\t\t\t s->reference);\n + \t} else\n \t\tstatus_printf_ln(s, c, _(\" (use \\\"git rm --cached ...\\\" to unstage)\"));\n -\tstatus_printf_ln(s, c, \"%s\", \"\");\n }\n \n static void wt_longstatus_print_dirty_header(struct wt_status *s,\n @@\n - \tstatus_printf_ln(s, c, _(\" (use \\\"git checkout -- ...\\\" to discard changes in working directory)\"));\n + \tstatus_printf_ln(s, c, _(\" (use \\\"git restore ...\\\" to discard changes in working directory)\"));\n \tif (has_dirty_submodules)\n \t\tstatus_printf_ln(s, c, _(\" (commit or discard the untracked or modified content in submodules)\"));\n -\tstatus_printf_ln(s, c, \"%s\", \"\");\n\n-- \ngitgitgadget\n"},{"id":"376658","messageId":"7dfb9a4b1a720e8d55ff06ba378b907a7ee7f77a.1559656939.git.gitgitgadget@gmail.com","threadId":"51098","inReplyTo":"pull.196.v2.git.gitgitgadget@gmail.com","subject":"[PATCH v2 1/1] status: remove the empty line after hints","fromName":"John Lin via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2019-06-04T14:02:21Z","receivedAt":"2019-06-04T14:02:26Z","isPatch":true,"sender":{"key":"johnlinp@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1290376?v=4"},"body":"From: John Lin \n\nBefore this patch, there is inconsistency between the status\nmessages with hints and the ones without hints: there is an\nempty line between the title and the file list if hints are\npresented, but there isn't one if there are no hints.\n\nThis patch remove the inconsistency by removing the empty\nlines even if hints are presented.\n\nSigned-off-by: John Lin \n---\n t/t7060-wtstatus.sh | 5 ----\n t/t7508-status.sh | 62 ------------------------------------------\n t/t7512-status-help.sh | 14 ----------\n wt-status.c | 4 ---\n 4 files changed, 85 deletions(-)\n\ndiff --git a/t/t7060-wtstatus.sh b/t/t7060-wtstatus.sh\nindex 53cf42fac1..d5218743e9 100755\n--- a/t/t7060-wtstatus.sh\n+++ b/t/t7060-wtstatus.sh\n@@ -38,7 +38,6 @@ You have unmerged paths.\n \n Unmerged paths:\n (use \"git add/rm ...\" as appropriate to mark resolution)\n-\n \tdeleted by us: foo\n \n no changes added to commit (use \"git add\" and/or \"git commit -a\")\n@@ -143,7 +142,6 @@ You have unmerged paths.\n \n Unmerged paths:\n (use \"git add/rm ...\" as appropriate to mark resolution)\n-\n \tboth added: conflict.txt\n \tdeleted by them: main.txt\n \n@@ -177,7 +175,6 @@ You have unmerged paths.\n \n Unmerged paths:\n (use \"git add/rm ...\" as appropriate to mark resolution)\n-\n \tboth deleted: main.txt\n \tadded by them: sub_master.txt\n \tadded by us: sub_second.txt\n@@ -201,12 +198,10 @@ You have unmerged paths.\n (use \"git merge --abort\" to abort the merge)\n \n Changes to be committed:\n-\n \tnew file: sub_master.txt\n \n Unmerged paths:\n (use \"git rm ...\" to mark resolution)\n-\n \tboth deleted: main.txt\n \n Untracked files not listed (use -u option to show untracked files)\ndiff --git a/t/t7508-status.sh b/t/t7508-status.sh\nindex 681bc314b4..4e676cdce8 100755\n--- a/t/t7508-status.sh\n+++ b/t/t7508-status.sh\n@@ -95,18 +95,15 @@ test_expect_success 'status --column' '\n #\n # Changes to be committed:\n # (use \"git restore --staged ...\" to unstage)\n-#\n #\tnew file: dir2/added\n #\n # Changes not staged for commit:\n # (use \"git add ...\" to update what will be committed)\n # (use \"git restore ...\" to discard changes in working directory)\n-#\n #\tmodified: dir1/modified\n #\n # Untracked files:\n # (use \"git add ...\" to include in what will be committed)\n-#\n #\tdir1/untracked dir2/untracked\n #\tdir2/modified untracked\n #\n@@ -129,18 +126,15 @@ cat >expect <<\\EOF\n #\n # Changes to be committed:\n # (use \"git restore --staged ...\" to unstage)\n-#\n #\tnew file: dir2/added\n #\n # Changes not staged for commit:\n # (use \"git add ...\" to update what will be committed)\n # (use \"git restore ...\" to discard changes in working directory)\n-#\n #\tmodified: dir1/modified\n #\n # Untracked files:\n # (use \"git add ...\" to include in what will be committed)\n-#\n #\tdir1/untracked\n #\tdir2/modified\n #\tdir2/untracked\n@@ -279,23 +273,19 @@ and have 1 and 2 different commits each, respectively.\n \n Changes to be committed:\n (use \"git restore --staged ...\" to unstage)\n-\n \tnew file: dir2/added\n \n Changes not staged for commit:\n (use \"git add ...\" to update what will be committed)\n (use \"git restore ...\" to discard changes in working directory)\n-\n \tmodified: dir1/modified\n \n Untracked files:\n (use \"git add ...\" to include in what will be committed)\n-\n \tdir2/modified\n \n Ignored files:\n (use \"git add -f ...\" to include in what will be committed)\n-\n \t.gitignore\n \tdir1/untracked\n \tdir2/untracked\n@@ -348,18 +338,15 @@ and have 1 and 2 different commits each, respectively.\n \n Changes to be committed:\n (use \"git restore --staged ...\" to unstage)\n-\n \tnew file: dir2/added\n \n Changes not staged for commit:\n (use \"git add ...\" to update what will be committed)\n (use \"git restore ...\" to discard changes in working directory)\n-\n \tmodified: dir1/modified\n \n Ignored files:\n (use \"git add -f ...\" to include in what will be committed)\n-\n \t.gitignore\n \tdir1/untracked\n \tdir2/modified\n@@ -421,13 +408,11 @@ and have 1 and 2 different commits each, respectively.\n \n Changes to be committed:\n (use \"git restore --staged ...\" to unstage)\n-\n \tnew file: dir2/added\n \n Changes not staged for commit:\n (use \"git add ...\" to update what will be committed)\n (use \"git restore ...\" to discard changes in working directory)\n-\n \tmodified: dir1/modified\n \n Untracked files not listed (use -u option to show untracked files)\n@@ -485,18 +470,15 @@ and have 1 and 2 different commits each, respectively.\n \n Changes to be committed:\n (use \"git restore --staged ...\" to unstage)\n-\n \tnew file: dir2/added\n \n Changes not staged for commit:\n (use \"git add ...\" to update what will be committed)\n (use \"git restore ...\" to discard changes in working directory)\n-\n \tmodified: dir1/modified\n \n Untracked files:\n (use \"git add ...\" to include in what will be committed)\n-\n \tdir1/untracked\n \tdir2/modified\n \tdir2/untracked\n@@ -543,18 +525,15 @@ and have 1 and 2 different commits each, respectively.\n \n Changes to be committed:\n (use \"git restore --staged ...\" to unstage)\n-\n \tnew file: dir2/added\n \n Changes not staged for commit:\n (use \"git add ...\" to update what will be committed)\n (use \"git restore ...\" to discard changes in working directory)\n-\n \tmodified: dir1/modified\n \n Untracked files:\n (use \"git add ...\" to include in what will be committed)\n-\n \tdir1/untracked\n \tdir2/modified\n \tdir2/untracked\n@@ -606,18 +585,15 @@ and have 1 and 2 different commits each, respectively.\n \n Changes to be committed:\n (use \"git restore --staged ...\" to unstage)\n-\n \tnew file: ../dir2/added\n \n Changes not staged for commit:\n (use \"git add ...\" to update what will be committed)\n (use \"git restore ...\" to discard changes in working directory)\n-\n \tmodified: modified\n \n Untracked files:\n (use \"git add ...\" to include in what will be committed)\n-\n \tuntracked\n \t../dir2/modified\n \t../dir2/untracked\n@@ -677,18 +653,15 @@ and have 1 and 2 different commits each, respectively.\n \n Changes to be committed:\n (use \"git restore --staged ...\" to unstage)\n-\n \tnew file: dir2/added\n \n Changes not staged for commit:\n (use \"git add ...\" to update what will be committed)\n (use \"git restore ...\" to discard changes in working directory)\n-\n \tmodified: dir1/modified\n \n Untracked files:\n (use \"git add ...\" to include in what will be committed)\n-\n \tdir1/untracked\n \tdir2/modified\n \tdir2/untracked\n@@ -803,18 +776,15 @@ and have 1 and 2 different commits each, respectively.\n \n Changes to be committed:\n (use \"git restore --staged ...\" to unstage)\n-\n \tnew file: dir2/added\n \n Changes not staged for commit:\n (use \"git add ...\" to update what will be committed)\n (use \"git restore ...\" to discard changes in working directory)\n-\n \tmodified: dir1/modified\n \n Untracked files:\n (use \"git add ...\" to include in what will be committed)\n-\n \tdir1/untracked\n \tdir2/modified\n \tdir2/untracked\n@@ -853,12 +823,10 @@ and have 1 and 2 different commits each, respectively.\n \n Changes to be committed:\n (use \"git restore --staged ...\" to unstage)\n-\n \tmodified: dir1/modified\n \n Untracked files:\n (use \"git add ...\" to include in what will be committed)\n-\n \tdir1/untracked\n \tdir2/\n \tuntracked\n@@ -897,19 +865,16 @@ and have 1 and 2 different commits each, respectively.\n \n Changes to be committed:\n (use \"git restore --staged ...\" to unstage)\n-\n \tnew file: dir2/added\n \tnew file: sm\n \n Changes not staged for commit:\n (use \"git add ...\" to update what will be committed)\n (use \"git restore ...\" to discard changes in working directory)\n-\n \tmodified: dir1/modified\n \n Untracked files:\n (use \"git add ...\" to include in what will be committed)\n-\n \tdir1/untracked\n \tdir2/modified\n \tdir2/untracked\n@@ -957,14 +922,12 @@ and have 1 and 2 different commits each, respectively.\n \n Changes to be committed:\n (use \"git restore --staged ...\" to unstage)\n-\n \tnew file: dir2/added\n \tnew file: sm\n \n Changes not staged for commit:\n (use \"git add ...\" to update what will be committed)\n (use \"git restore ...\" to discard changes in working directory)\n-\n \tmodified: dir1/modified\n \n Submodule changes to be committed:\n@@ -974,7 +937,6 @@ Submodule changes to be committed:\n \n Untracked files:\n (use \"git add ...\" to include in what will be committed)\n-\n \tdir1/untracked\n \tdir2/modified\n \tdir2/untracked\n@@ -1020,12 +982,10 @@ and have 2 and 2 different commits each, respectively.\n Changes not staged for commit:\n (use \"git add ...\" to update what will be committed)\n (use \"git restore ...\" to discard changes in working directory)\n-\n \tmodified: dir1/modified\n \n Untracked files:\n (use \"git add ...\" to include in what will be committed)\n-\n \tdir1/untracked\n \tdir2/modified\n \tdir2/untracked\n@@ -1069,14 +1029,12 @@ and have 2 and 2 different commits each, respectively.\n \n Changes to be committed:\n (use \"git restore --source=HEAD^1 --staged ...\" to unstage)\n-\n \tnew file: dir2/added\n \tnew file: sm\n \n Changes not staged for commit:\n (use \"git add ...\" to update what will be committed)\n (use \"git restore ...\" to discard changes in working directory)\n-\n \tmodified: dir1/modified\n \n Submodule changes to be committed:\n@@ -1086,7 +1044,6 @@ Submodule changes to be committed:\n \n Untracked files:\n (use \"git add ...\" to include in what will be committed)\n-\n \tdir1/untracked\n \tdir2/modified\n \tdir2/untracked\n@@ -1124,13 +1081,11 @@ and have 2 and 2 different commits each, respectively.\n \n Changes to be committed:\n (use \"git restore --staged ...\" to unstage)\n-\n \tmodified: sm\n \n Changes not staged for commit:\n (use \"git add ...\" to update what will be committed)\n (use \"git restore ...\" to discard changes in working directory)\n-\n \tmodified: dir1/modified\n \n Submodule changes to be committed:\n@@ -1140,7 +1095,6 @@ Submodule changes to be committed:\n \n Untracked files:\n (use \"git add ...\" to include in what will be committed)\n-\n \t.gitmodules\n \tdir1/untracked\n \tdir2/modified\n@@ -1236,14 +1190,12 @@ and have 2 and 2 different commits each, respectively.\n \n Changes to be committed:\n (use \"git restore --staged ...\" to unstage)\n-\n \tmodified: sm\n \n Changes not staged for commit:\n (use \"git add ...\" to update what will be committed)\n (use \"git restore ...\" to discard changes in working directory)\n (commit or discard the untracked or modified content in submodules)\n-\n \tmodified: dir1/modified\n \tmodified: sm (modified content)\n \n@@ -1254,7 +1206,6 @@ Submodule changes to be committed:\n \n Untracked files:\n (use \"git add ...\" to include in what will be committed)\n-\n \t.gitmodules\n \tdir1/untracked\n \tdir2/modified\n@@ -1296,13 +1247,11 @@ and have 2 and 2 different commits each, respectively.\n \n Changes to be committed:\n (use \"git restore --staged ...\" to unstage)\n-\n \tmodified: sm\n \n Changes not staged for commit:\n (use \"git add ...\" to update what will be committed)\n (use \"git restore ...\" to discard changes in working directory)\n-\n \tmodified: dir1/modified\n \tmodified: sm (new commits)\n \n@@ -1318,7 +1267,6 @@ Submodules changed but not updated:\n \n Untracked files:\n (use \"git add ...\" to include in what will be committed)\n-\n \t.gitmodules\n \tdir1/untracked\n \tdir2/modified\n@@ -1380,13 +1328,11 @@ cat > expect << EOF\n ;\n ; Changes to be committed:\n ; (use \"git restore --staged ...\" to unstage)\n-;\n ;\tmodified: sm\n ;\n ; Changes not staged for commit:\n ; (use \"git add ...\" to update what will be committed)\n ; (use \"git restore ...\" to discard changes in working directory)\n-;\n ;\tmodified: dir1/modified\n ;\tmodified: sm (new commits)\n ;\n@@ -1402,7 +1348,6 @@ cat > expect << EOF\n ;\n ; Untracked files:\n ; (use \"git add ...\" to include in what will be committed)\n-;\n ;\t.gitmodules\n ;\tdir1/untracked\n ;\tdir2/modified\n@@ -1432,12 +1377,10 @@ and have 2 and 2 different commits each, respectively.\n Changes not staged for commit:\n (use \"git add ...\" to update what will be committed)\n (use \"git restore ...\" to discard changes in working directory)\n-\n \tmodified: dir1/modified\n \n Untracked files:\n (use \"git add ...\" to include in what will be committed)\n-\n \t.gitmodules\n \tdir1/untracked\n \tdir2/modified\n@@ -1459,18 +1402,15 @@ and have 2 and 2 different commits each, respectively.\n \n Changes to be committed:\n (use \"git restore --staged ...\" to unstage)\n-\n \tmodified: sm\n \n Changes not staged for commit:\n (use \"git add ...\" to update what will be committed)\n (use \"git restore ...\" to discard changes in working directory)\n-\n \tmodified: dir1/modified\n \n Untracked files:\n (use \"git add ...\" to include in what will be committed)\n-\n \t.gitmodules\n \tdir1/untracked\n \tdir2/modified\n@@ -1582,13 +1522,11 @@ and have 2 and 2 different commits each, respectively.\n \n Changes to be committed:\n (use \"git restore --staged ...\" to unstage)\n-\n \tmodified: sm\n \n Changes not staged for commit:\n (use \"git add ...\" to update what will be committed)\n (use \"git restore ...\" to discard changes in working directory)\n-\n \tmodified: dir1/modified\n \n Untracked files not listed (use -u option to show untracked files)\ndiff --git a/t/t7512-status-help.sh b/t/t7512-status-help.sh\nindex 1b9712c675..bf0b2c8bdb 100755\n--- a/t/t7512-status-help.sh\n+++ b/t/t7512-status-help.sh\n@@ -33,7 +33,6 @@ You have unmerged paths.\n \n Unmerged paths:\n (use \"git add ...\" to mark resolution)\n-\n \tboth modified: main.txt\n \n no changes added to commit (use \"git add\" and/or \"git commit -a\")\n@@ -54,7 +53,6 @@ All conflicts fixed but you are still merging.\n (use \"git commit\" to conclude merge)\n \n Changes to be committed:\n-\n \tmodified: main.txt\n \n Untracked files not listed (use -u option to show untracked files)\n@@ -87,7 +85,6 @@ You are currently rebasing branch '\\''rebase_conflicts'\\'' on '\\''$ONTO'\\''.\n Unmerged paths:\n (use \"git restore --staged ...\" to unstage)\n (use \"git add ...\" to mark resolution)\n-\n \tboth modified: main.txt\n \n no changes added to commit (use \"git add\" and/or \"git commit -a\")\n@@ -111,7 +108,6 @@ You are currently rebasing branch '\\''rebase_conflicts'\\'' on '\\''$ONTO'\\''.\n \n Changes to be committed:\n (use \"git restore --staged ...\" to unstage)\n-\n \tmodified: main.txt\n \n Untracked files not listed (use -u option to show untracked files)\n@@ -150,7 +146,6 @@ You are currently rebasing branch '\\''rebase_i_conflicts_second'\\'' on '\\''$ONTO\n Unmerged paths:\n (use \"git restore --staged ...\" to unstage)\n (use \"git add ...\" to mark resolution)\n-\n \tboth modified: main.txt\n \n no changes added to commit (use \"git add\" and/or \"git commit -a\")\n@@ -177,7 +172,6 @@ You are currently rebasing branch '\\''rebase_i_conflicts_second'\\'' on '\\''$ONTO\n \n Changes to be committed:\n (use \"git restore --staged ...\" to unstage)\n-\n \tmodified: main.txt\n \n Untracked files not listed (use -u option to show untracked files)\n@@ -247,7 +241,6 @@ You are currently splitting a commit while rebasing branch '\\''split_commit'\\''\n Changes not staged for commit:\n (use \"git add ...\" to update what will be committed)\n (use \"git restore ...\" to discard changes in working directory)\n-\n \tmodified: main.txt\n \n no changes added to commit (use \"git add\" and/or \"git commit -a\")\n@@ -355,7 +348,6 @@ You are currently splitting a commit while rebasing branch '\\''several_edits'\\''\n Changes not staged for commit:\n (use \"git add ...\" to update what will be committed)\n (use \"git restore ...\" to discard changes in working directory)\n-\n \tmodified: main.txt\n \n no changes added to commit (use \"git add\" and/or \"git commit -a\")\n@@ -454,7 +446,6 @@ You are currently splitting a commit while rebasing branch '\\''several_edits'\\''\n Changes not staged for commit:\n (use \"git add ...\" to update what will be committed)\n (use \"git restore ...\" to discard changes in working directory)\n-\n \tmodified: main.txt\n \n no changes added to commit (use \"git add\" and/or \"git commit -a\")\n@@ -558,7 +549,6 @@ You are currently splitting a commit while rebasing branch '\\''several_edits'\\''\n Changes not staged for commit:\n (use \"git add ...\" to update what will be committed)\n (use \"git restore ...\" to discard changes in working directory)\n-\n \tmodified: main.txt\n \n no changes added to commit (use \"git add\" and/or \"git commit -a\")\n@@ -747,7 +737,6 @@ You are currently cherry-picking commit $TO_CHERRY_PICK.\n \n Unmerged paths:\n (use \"git add ...\" to mark resolution)\n-\n \tboth modified: main.txt\n \n no changes added to commit (use \"git add\" and/or \"git commit -a\")\n@@ -771,7 +760,6 @@ You are currently cherry-picking commit $TO_CHERRY_PICK.\n (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)\n \n Changes to be committed:\n-\n \tmodified: main.txt\n \n Untracked files not listed (use -u option to show untracked files)\n@@ -818,7 +806,6 @@ You are currently reverting commit $TO_REVERT.\n Unmerged paths:\n (use \"git restore --staged ...\" to unstage)\n (use \"git add ...\" to mark resolution)\n-\n \tboth modified: to-revert.txt\n \n no changes added to commit (use \"git add\" and/or \"git commit -a\")\n@@ -838,7 +825,6 @@ You are currently reverting commit $TO_REVERT.\n \n Changes to be committed:\n (use \"git restore --staged ...\" to unstage)\n-\n \tmodified: to-revert.txt\n \n Untracked files not listed (use -u option to show untracked files)\ndiff --git a/wt-status.c b/wt-status.c\nindex 19fd1add75..ddab6b93be 100644\n--- a/wt-status.c\n+++ b/wt-status.c\n@@ -199,7 +199,6 @@ static void wt_longstatus_print_unmerged_header(struct wt_status *s)\n \t} else {\n \t\tstatus_printf_ln(s, c, _(\" (use \\\"git add/rm ...\\\" as appropriate to mark resolution)\"));\n \t}\n-\tstatus_printf_ln(s, c, \"%s\", \"\");\n }\n \n static void wt_longstatus_print_cached_header(struct wt_status *s)\n@@ -221,7 +220,6 @@ static void wt_longstatus_print_cached_header(struct wt_status *s)\n \t\t\t\t\t s->reference);\n \t} else\n \t\tstatus_printf_ln(s, c, _(\" (use \\\"git rm --cached ...\\\" to unstage)\"));\n-\tstatus_printf_ln(s, c, \"%s\", \"\");\n }\n \n static void wt_longstatus_print_dirty_header(struct wt_status *s,\n@@ -240,7 +238,6 @@ static void wt_longstatus_print_dirty_header(struct wt_status *s,\n \tstatus_printf_ln(s, c, _(\" (use \\\"git restore ...\\\" to discard changes in working directory)\"));\n \tif (has_dirty_submodules)\n \t\tstatus_printf_ln(s, c, _(\" (commit or discard the untracked or modified content in submodules)\"));\n-\tstatus_printf_ln(s, c, \"%s\", \"\");\n }\n \n static void wt_longstatus_print_other_header(struct wt_status *s,\n@@ -252,7 +249,6 @@ static void wt_longstatus_print_other_header(struct wt_status *s,\n \tif (!s->hints)\n \t\treturn;\n \tstatus_printf_ln(s, c, _(\" (use \\\"git %s ...\\\" to include in what will be committed)\"), how);\n-\tstatus_printf_ln(s, c, \"%s\", \"\");\n }\n \n static void wt_longstatus_print_trailer(struct wt_status *s)\n-- \ngitgitgadget\n"}]}