mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'sb/submodule-diff-header-fix'

Browse Source 
Error message tweak.

* sb/submodule-diff-header-fix:
  submodule: correct error message for missing commits
This commit is contained in:
Junio C Hamano
2017-10-03 15:42:49 +09:00
parent 98c57ea6f0 2d94dd2fc6
commit 9257d3d7db
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
submodule.c
View File

@ -503,7 +503,7 @@ static void show_submodule_header(struct diff_options *o, const char *path,
if (add_submodule_odb(path)) { if (add_submodule_odb(path)) {
if (!message) if (!message)
message = "(not initialized)"; message = "(commits not present)";
goto output_header; goto output_header;
} }

2
t/t4059-diff-submodule-not-initialized.sh
View File

@ -95,7 +95,7 @@ test_expect_success 'submodule not initialized in new clone' '
git clone . sm3 && git clone . sm3 &&
git -C sm3 diff-tree -p --no-commit-id --submodule=log HEAD >actual && git -C sm3 diff-tree -p --no-commit-id --submodule=log HEAD >actual &&
cat >expected <<-EOF && cat >expected <<-EOF &&
Submodule sm1 $smhead1...$smhead2 (not initialized) Submodule sm1 $smhead1...$smhead2 (commits not present)
EOF EOF
test_cmp expected actual test_cmp expected actual
' '