Merge branch 'cc/test-ref-store-typofix'

gitster · gitster · commit e91a1b1ade3e · 2019-02-05T14:26:13.000-08:00
An obvious typo in an assertion error message has been fixed.

* cc/test-ref-store-typofix:
  helper/test-ref-store: fix "new-sha1" vs "old-sha1" typo
diff --git a/t/helper/test-ref-store.c b/t/helper/test-ref-store.c
@@ -233,7 +233,7 @@ static int cmd_update_ref(struct ref_store *refs, const char **argv)
 {
 	const char *msg = notnull(*argv++, "msg");
 	const char *refname = notnull(*argv++, "refname");
-	const char *new_sha1_buf = notnull(*argv++, "old-sha1");
+	const char *new_sha1_buf = notnull(*argv++, "new-sha1");
 	const char *old_sha1_buf = notnull(*argv++, "old-sha1");
 	unsigned int flags = arg_flags(*argv++, "flags");
 	struct object_id old_oid;

Original file line number	Diff line number	Diff line change
`@@ -233,7 +233,7 @@ static int cmd_update_ref(struct ref_store refs, const char *argv)`
`233`	`233`	`{`
`234`	`234`	`const char msg = notnull(argv++, "msg");`
`235`	`235`	`const char refname = notnull(argv++, "refname");`
`236`		`- const char new_sha1_buf = notnull(argv++, "old-sha1");`
	`236`	`+ const char new_sha1_buf = notnull(argv++, "new-sha1");`
`237`	`237`	`const char old_sha1_buf = notnull(argv++, "old-sha1");`
`238`	`238`	`unsigned int flags = arg_flags(*argv++, "flags");`
`239`	`239`	`struct object_id old_oid;`