diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-06-30 13:45:22 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-06-30 13:45:22 -0700 |
| commit | 7e46f19a105f3798b03ac3887f45034fbfdff676 (patch) | |
| tree | f258b34d49b1e01d41e6de033e091335359cb9a8 /t | |
| parent | c7ee0baae7e874898032ab0c63600951eb7c2d18 (diff) | |
| parent | 4ddb1354e8d5daf5671d3d451a67d2d1e82d9b49 (diff) | |
| download | git-7e46f19a105f3798b03ac3887f45034fbfdff676.tar.gz | |
Merge branch 'ks/status-initial-commit'
"git status" has long shown essentially the same message as "git
commit"; the message it gives while preparing for the root commit,
i.e. "Initial commit", was hard to understand for some new users.
Now it says "No commits yet" to stress more on the current status
(rather than the commit the user is preparing for, which is more in
line with the focus of "git commit").
* ks/status-initial-commit:
status: contextually notify user about an initial commit
Diffstat (limited to 't')
| -rwxr-xr-x | t/t7501-commit.sh | 2 | ||||
| -rwxr-xr-x | t/t7508-status.sh | 30 |
2 files changed, 31 insertions, 1 deletions
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 f7fe22a195..43d19a9b22 100755 --- a/t/t7508-status.sh +++ b/t/t7508-status.sh @@ -1640,4 +1640,34 @@ test_expect_success 'no additionnal info if no stash entries' ' test_cmp expected_without_stash actual ' +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 |