When typing "git status", there is an empty line between
the "Changes not staged for commit:" block and the list
of changed files. However, when typing "git commit" with
no files added, there are no empty lines between them.
This patch adds empty lines in the above case and some
similar cases.
Signed-off-by: John Lin <johnlinp@xxxxxxxxx>
---
t/t7500-commit-template-squash-signoff.sh | 1 +
t/t7508-status.sh | 5 +++++
t/t7512-status-help.sh | 1 +
wt-status.c | 12 ++++++++----
4 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/t/t7500-commit-template-squash-signoff.sh b/t/t7500-commit-template-squash-signoff.sh
index 46a5cd4b73..0423e77d1d 100755
--- a/t/t7500-commit-template-squash-signoff.sh
+++ b/t/t7500-commit-template-squash-signoff.sh
@@ -345,6 +345,7 @@ cat >expected-template <<EOF
#
# On branch commit-template-check
# Changes to be committed:
+#
# new file: commit-template-check
#
# Untracked files not listed
diff --git a/t/t7508-status.sh b/t/t7508-status.sh
index e1f11293e2..949b1dbcc4 100755
--- a/t/t7508-status.sh
+++ b/t/t7508-status.sh
@@ -204,12 +204,15 @@ Your branch and 'upstream' have diverged,
and have 1 and 2 different commits each, respectively.
Changes to be committed:
+
new file: dir2/added
Changes not staged for commit:
+
modified: dir1/modified
Untracked files:
+
dir1/untracked
dir2/modified
dir2/untracked
@@ -449,9 +452,11 @@ Your branch and '\''upstream'\'' have diverged,
and have 1 and 2 different commits each, respectively.
Changes to be committed:
+
new file: dir2/added
Changes not staged for commit:
+
modified: dir1/modified
Untracked files not listed
diff --git a/t/t7512-status-help.sh b/t/t7512-status-help.sh
index 458608cc1e..0a29fa66a2 100755
--- a/t/t7512-status-help.sh
+++ b/t/t7512-status-help.sh
@@ -714,6 +714,7 @@ rebase in progress; onto $ONTO
You are currently rebasing branch '\''statushints_disabled'\'' on '\''$ONTO'\''.
Unmerged paths:
+
both modified: main.txt
no changes added to commit
diff --git a/wt-status.c b/wt-status.c
index 445a36204a..0766e3ee12 100644
--- a/wt-status.c
+++ b/wt-status.c
@@ -175,7 +175,7 @@ static void wt_longstatus_print_unmerged_header(struct wt_status *s)
}
if (!s->hints)
- return;
+ goto conclude;
if (s->whence != FROM_COMMIT)
;
else if (!s->is_initial)
@@ -193,6 +193,7 @@ static void wt_longstatus_print_unmerged_header(struct wt_status *s)
} else {
status_printf_ln(s, c, _(" (use \"git add/rm <file>...\" as appropriate to mark resolution)"));
}
+conclude:
status_printf_ln(s, c, "%s", "");
}
@@ -202,13 +203,14 @@ static void wt_longstatus_print_cached_header(struct wt_status *s)
status_printf_ln(s, c, _("Changes to be committed:"));
if (!s->hints)
- return;
+ goto conclude;
if (s->whence != FROM_COMMIT)
; /* NEEDSWORK: use "git reset --unresolve"??? */
else if (!s->is_initial)
status_printf_ln(s, c, _(" (use \"git reset %s <file>...\" to unstage)"), s->reference);
else
status_printf_ln(s, c, _(" (use \"git rm --cached <file>...\" to unstage)"));
+conclude:
status_printf_ln(s, c, "%s", "");
}
@@ -220,7 +222,7 @@ static void wt_longstatus_print_dirty_header(struct wt_status *s,
status_printf_ln(s, c, _("Changes not staged for commit:"));
if (!s->hints)
- return;
+ goto conclude;
if (!has_deleted)
status_printf_ln(s, c, _(" (use \"git add <file>...\" to update what will be committed)"));
else
@@ -228,6 +230,7 @@ static void wt_longstatus_print_dirty_header(struct wt_status *s,
status_printf_ln(s, c, _(" (use \"git checkout -- <file>...\" 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)"));
+conclude:
status_printf_ln(s, c, "%s", "");
}
@@ -238,8 +241,9 @@ static void wt_longstatus_print_other_header(struct wt_status *s,
const char *c = color(WT_STATUS_HEADER, s);
status_printf_ln(s, c, "%s:", what);
if (!s->hints)
- return;
+ goto conclude;
status_printf_ln(s, c, _(" (use \"git %s <file>...\" to include in what will be committed)"), how);
+conclude:
status_printf_ln(s, c, "%s", "");
}
--
2.21.0
