On Tue, Jun 20 2017, Kaartic Sivaraam jotted: > "git status" indicated "Initial commit" when HEAD points at > an unborn branch. This message is shared with the commit > log template "git commit" prepares for the user when > creating a commit (i.e. "You are about to create the initial > commit"), and is OK as long as the reader is aware of the > nature of the message (i.e. it guides the user working > toward the next commit), but was confusing to new users, > especially the ones who do "git commit -m message" without > having a chance to pay attention to the commit log template. > > The "Initial commit" indication wasn't an issue in the commit > template. Taking that into consideration, a good solution would > be to contextually use different messages to indicate the user > that there were no commits in this branch. > > A few alternatives considered were, > > * Waiting for initial commit > * Your current branch does not have any commits > * Current branch waiting for initial commit > > The most succint one, "No commits yet", among the alternatives > was chosen. > > Helped-by: Junio C Hamano <gitster@xxxxxxxxx> > Signed-off-by: Kaartic Sivaraam <kaarticsivaraam91196@xxxxxxxxx> There's a few issues with these 3 patches I think should be fixed: * Let's do that spacing fix (unrelated fix) in its own commit. * You should add tests along with the code being changed, and especially change tests that would fail with your new code, otherwise you break bisection. * I think the commit message here could be shorter & clearer at the same time. * The commit message doesn't follow our usual format. Other than that this looks good to me. I've pushed a fixed version with those fixes to help-kaartic-with-no-commits-yet on github.com/avar/git (https://github.com/avar/git/tree/help-kaartic-with-no-commits-yet). You could just submit that as a v2 pending any comments others might have. That yields a 2 patch series, here pasted below for on-list review: commit 23d792d8d3 Author: Kaartic Sivaraam <kaarticsivaraam91196@xxxxxxxxx> Date: Tue Jun 20 08:32:20 2017 +0530 status tests: fix a minor indenting issue Change the indentation from "\t " to "\t". This indenting issue was introduced when the test was added in commit 1d2f393ac9 ("status/commit: show staged submodules regardless of ignore config", 2014-04-05). Helped-by: Ævar Arnfjörð Bjarmason <avarab@xxxxxxxxx> Helped-by: Junio C Hamano <gitster@xxxxxxxxx> Signed-off-by: Kaartic Sivaraam <kaarticsivaraam91196@xxxxxxxxx> Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@xxxxxxxxx> diff --git a/t/t7508-status.sh b/t/t7508-status.sh index 79427840a4..ebad377d68 100755 --- a/t/t7508-status.sh +++ b/t/t7508-status.sh @@ -1603,7 +1603,7 @@ EOF test_expect_success 'git commit -m will commit a staged but ignored submodule' ' git commit -uno -m message && git status -s --ignore-submodules=dirty >output && - test_i18ngrep ! "^M. sm" output && + test_i18ngrep ! "^M. sm" output && git config --remove-section submodule.subname && git config -f .gitmodules --remove-section submodule.subname ' commit d2eed0491c (HEAD -> help-kaartic-with-no-commits-yet, avar/help-kaartic-with-no-commits-yet) Author: Kaartic Sivaraam <kaarticsivaraam91196@xxxxxxxxx> Date: Tue Jun 20 08:32:18 2017 +0530 status: contextually notify user about an initial commit Change the output of "status" to say "No commits yet" when "git status" is run on a fresh repo (or orphan branch), while retaining the current "Initial commit" message displayed in the template that's displayed in the editor when the initial commit is being authored. The existing "Initial commit" message makes sense for the commit template where we're making the initial commit, but is confusing when merely checking the status of a fresh repository without having any commits yet. Helped-by: Junio C Hamano <gitster@xxxxxxxxx> Signed-off-by: Kaartic Sivaraam <kaarticsivaraam91196@xxxxxxxxx> Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@xxxxxxxxx> diff --git a/builtin/commit.c b/builtin/commit.c index e3c9e190b0..8d075c15a3 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -1652,6 +1652,7 @@ int cmd_commit(int argc, const char **argv, const char *prefix) usage_with_options(builtin_commit_usage, builtin_commit_options); status_init_config(&s, git_commit_config); + s.commit_template = 1; status_format = STATUS_FORMAT_NONE; /* Ignore status.short */ s.colopts = 0; diff --git a/t/t7501-commit.sh b/t/t7501-commit.sh index 0b6da7ae1f..fa61b1a4ee 100755 --- a/t/t7501-commit.sh +++ b/t/t7501-commit.sh @@ -18,7 +18,7 @@ test_expect_success 'initial status' ' echo bongo bongo >file && git add file && git status >actual && - test_i18ngrep "Initial commit" actual + test_i18ngrep "No commits yet" actual ' test_expect_success 'fail initial amend' ' diff --git a/t/t7508-status.sh b/t/t7508-status.sh index ebad377d68..57a37f88a4 100755 --- a/t/t7508-status.sh +++ b/t/t7508-status.sh @@ -1608,4 +1608,34 @@ test_expect_success 'git commit -m will commit a staged but ignored submodule' ' git config -f .gitmodules --remove-section submodule.subname ' +test_expect_success '"No commits yet" should be noted in status output' ' + git checkout --orphan empty-branch-1 && + git status >output && + test_i18ngrep "No commits yet" output +' + +test_expect_success '"No commits yet" should not be noted in status output' ' + git checkout --orphan empty-branch-2 && + test_commit test-commit-1 && + git status >output && + test_i18ngrep ! "No commits yet" output +' + +test_expect_success '"Initial commit" should be noted in commit template' ' + git checkout --orphan empty-branch-3 && + touch to_be_committed_1 && + git add to_be_committed_1 && + git commit --dry-run >output && + test_i18ngrep "Initial commit" output +' + +test_expect_success '"Initial commit" should not be noted in commit template' ' + git checkout --orphan empty-branch-4 && + test_commit test-commit-2 && + touch to_be_committed_2 && + git add to_be_committed_2 && + git commit --dry-run >output && + test_i18ngrep ! "Initial commit" output +' + test_done diff --git a/wt-status.c b/wt-status.c index bf651f16fa..f324ea20a6 100644 --- a/wt-status.c +++ b/wt-status.c @@ -1579,7 +1579,10 @@ static void wt_longstatus_print(struct wt_status *s) if (s->is_initial) { status_printf_ln(s, color(WT_STATUS_HEADER, s), "%s", ""); - status_printf_ln(s, color(WT_STATUS_HEADER, s), _("Initial commit")); + status_printf_ln(s, color(WT_STATUS_HEADER, s), + s->commit_template + ? _("Initial commit") + : _("No commits yet")); status_printf_ln(s, color(WT_STATUS_HEADER, s), "%s", ""); } diff --git a/wt-status.h b/wt-status.h index 8a3864783b..2389f08390 100644 --- a/wt-status.h +++ b/wt-status.h @@ -76,6 +76,7 @@ struct wt_status { char color_palette[WT_STATUS_MAXSLOT][COLOR_MAXLEN]; unsigned colopts; int null_termination; + int commit_template; int show_branch; int hints;
