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

gitster · gitster · commit 9257d3d7db17 · 2017-10-03T15:42:49.000+09:00
Error message tweak.

* sb/submodule-diff-header-fix:
  submodule: correct error message for missing commits
diff --git 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
@@ -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
 '

Original file line number	Diff line number	Diff line change
`@@ -503,7 +503,7 @@ static void show_submodule_header(struct diff_options o, const char path,`
`503`	`503`
`504`	`504`	`if (add_submodule_odb(path)) {`
`505`	`505`	`if (!message)`
`506`		`- message = "(not initialized)";`
	`506`	`+ message = "(commits not present)";`
`507`	`507`	`goto output_header;`
`508`	`508`	`}`
`509`	`509`
Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ test_expect_success 'submodule not initialized in new clone' '`
`95`	`95`	`git clone . sm3 &&`
`96`	`96`	`git -C sm3 diff-tree -p --no-commit-id --submodule=log HEAD >actual &&`
`97`	`97`	`cat >expected <<-EOF &&`
`98`		`- Submodule sm1 $smhead1...$smhead2 (not initialized)`
	`98`	`+ Submodule sm1 $smhead1...$smhead2 (commits not present)`
`99`	`99`	`EOF`
`100`	`100`	`test_cmp expected actual`
`101`	`101`	`'`