From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 5 Feb 2019 22:26:12 +0000 (-0800)
Subject: Merge branch 'cc/test-ref-store-typofix'
X-Git-Tag: v2.21.0-rc0~49
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e91a1b1ade3ea07bdf8cdd8cd4fa126caac12a36;p=git

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

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
---

e91a1b1ade3ea07bdf8cdd8cd4fa126caac12a36
diff --cc t/helper/test-ref-store.c
index e9e0541276,862331c029..799fc00aa1
--- a/t/helper/test-ref-store.c
+++ b/t/helper/test-ref-store.c
@@@ -233,14 -211,14 +233,14 @@@ static int cmd_update_ref(struct ref_st
  {
  	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");
 -	unsigned char old_sha1[20];
 -	unsigned char new_sha1[20];
 +	struct object_id old_oid;
 +	struct object_id new_oid;
  
 -	if (get_sha1_hex(old_sha1_buf, old_sha1) ||
 -	    get_sha1_hex(new_sha1_buf, new_sha1))
 +	if (get_oid_hex(old_sha1_buf, &old_oid) ||
 +	    get_oid_hex(new_sha1_buf, &new_oid))
  		die("not sha-1");
  
  	return refs_update_ref(refs, msg, refname,