Merge branch 'cc/test-ref-store-typofix'
authorJunio C Hamano <gitster@pobox.com>
Tue, 5 Feb 2019 22:26:12 +0000 (14:26 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 5 Feb 2019 22:26:13 +0000 (14:26 -0800)
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

1  2 
t/helper/test-ref-store.c
index e9e0541276c50d1739b6d39f2c01ba8ecb782adc,862331c029f31b7771eaf5161d07fb90965655a3..799fc00aa15b1e4cfe9fe8a6d32ebc2063003cb4
@@@ -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,