diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-10-03 15:42:49 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-10-03 15:42:49 +0900 |
| commit | 9257d3d7db17be306875f41b842716d275a3f76a (patch) | |
| tree | a768e0be9e989fd68185e7521229e10f247f0c9a | |
| parent | 98c57ea6f00282ed6ab245cf6842972b07c5a6fd (diff) | |
| parent | 2d94dd2fc6428ff5f0a18223aadaaecd49fd18e5 (diff) | |
| download | git-9257d3d7db17be306875f41b842716d275a3f76a.tar.xz | |
Merge branch 'sb/submodule-diff-header-fix'
Error message tweak.
* sb/submodule-diff-header-fix:
submodule: correct error message for missing commits
| -rw-r--r-- | submodule.c | 2 | ||||
| -rwxr-xr-x | t/t4059-diff-submodule-not-initialized.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/submodule.c b/submodule.c index 3e3ea11761..63e7094e16 100644 --- a/submodule.c +++ b/submodule.c @@ -503,7 +503,7 @@ static void show_submodule_header(struct diff_options *o, const char *path, if (add_submodule_odb(path)) { if (!message) - message = "(not initialized)"; + message = "(commits not present)"; goto output_header; } diff --git a/t/t4059-diff-submodule-not-initialized.sh b/t/t4059-diff-submodule-not-initialized.sh index cd70fd5192..49bca7b48d 100755 --- a/t/t4059-diff-submodule-not-initialized.sh +++ b/t/t4059-diff-submodule-not-initialized.sh @@ -95,7 +95,7 @@ test_expect_success 'submodule not initialized in new clone' ' git clone . sm3 && git -C sm3 diff-tree -p --no-commit-id --submodule=log HEAD >actual && cat >expected <<-EOF && - Submodule sm1 $smhead1...$smhead2 (not initialized) + Submodule sm1 $smhead1...$smhead2 (commits not present) EOF test_cmp expected actual ' |