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

Error message tweak.

* sb/submodule-diff-header-fix:
submodule: correct error message for missing commits

diff --git a/submodule.c b/submodule.c
index 3e3ea11761fda1c48a3cdd88e146a0f20338c364..63e7094e1620c2c3eb7dda0a8c38a833ae2d1c5a 100644 (file)
--- 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 cd70fd5192ea88b9ccba4680f578d8c01be64945..49bca7b48d910fa1128435f121c849e45a7eefa6 100755 (executable)
--- 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
 '