diff options
| author | John Lin <johnlinp@gmail.com> | 2019-06-04 14:02:21 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-06-21 15:54:05 (GMT) |
| commit | b2f5171ecc2feb4192acd80f5a6b05c06e099e97 (patch) | |
| tree | e2bfb731d326b918cc434e63c80f82352d35ed06 /t/t7060-wtstatus.sh | |
| parent | 97ed685701a6df0273f7d29fd5bc0a0658a63cad (diff) | |
| download | git-b2f5171ecc2feb4192acd80f5a6b05c06e099e97.zip git-b2f5171ecc2feb4192acd80f5a6b05c06e099e97.tar.gz git-b2f5171ecc2feb4192acd80f5a6b05c06e099e97.tar.bz2 | |
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 <johnlinp@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7060-wtstatus.sh')
| -rwxr-xr-x | t/t7060-wtstatus.sh | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/t/t7060-wtstatus.sh b/t/t7060-wtstatus.sh index 53cf42f..d521874 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 <file>..." 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 <file>..." 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 <file>..." 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 <file>..." to mark resolution) - both deleted: main.txt Untracked files not listed (use -u option to show untracked files) |