add: include magic part of pathspec on --refresh error

matheustavares · gitster · commit 4e9569834936 · 2021-04-08T14:18:03.000-07:00
When `git add --refresh &lt;pathspec&gt;` doesn't find any matches for the
given pathspec, it prints an error message using the `match` field of
the `struct pathspec_item`. However, this field doesn't contain the
magic part of the pathspec. Instead, let's use the `original` field.

Signed-off-by: Matheus Tavares &lt;matheus.bernardino@usp.br&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/builtin/add.c b/builtin/add.c
@@ -187,7 +187,7 @@ static void refresh(int verbose, const struct pathspec *pathspec)
 	for (i = 0; i < pathspec->nr; i++) {
 		if (!seen[i])
 			die(_("pathspec '%s' did not match any files"),
-			    pathspec->items[i].match);
+			    pathspec->items[i].original);
 	}
 	free(seen);
 }
diff --git a/t/t3700-add.sh b/t/t3700-add.sh
@@ -196,6 +196,12 @@ test_expect_success 'git add --refresh with pathspec' '
 	grep baz actual
 '
 
+test_expect_success 'git add --refresh correctly reports no match error' "
+	echo \"fatal: pathspec ':(icase)nonexistent' did not match any files\" >expect &&
+	test_must_fail git add --refresh ':(icase)nonexistent' 2>actual &&
+	test_cmp expect actual
+"
+
 test_expect_success POSIXPERM,SANITY 'git add should fail atomically upon an unreadable file' '
 	git reset --hard &&
 	date >foo1 &&

Original file line number	Diff line number	Diff line change
`@@ -187,7 +187,7 @@ static void refresh(int verbose, const struct pathspec *pathspec)`
`187`	`187`	`for (i = 0; i < pathspec->nr; i++) {`
`188`	`188`	`if (!seen[i])`
`189`	`189`	`die(_("pathspec '%s' did not match any files"),`
`190`		`- pathspec->items[i].match);`
	`190`	`+ pathspec->items[i].original);`
`191`	`191`	`}`
`192`	`192`	`free(seen);`
`193`	`193`	`}`