| Message ID | 20190106154637.10815-1-chriscool@tuxfamily.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | helper/test-ref-store: fix "new-sha1" vs "old-sha1" typo | expand |
On Sun, Jan 6, 2019 at 10:46 PM Christian Couder <christian.couder@gmail.com> wrote: > > It looks like it is a copy-paste error made in 80f2a6097c > (t/helper: add test-ref-store to test ref-store functions, > 2017-03-26) to pass "old-sha1" instead of "new-sha1" to > notnull() when we get the new sha1 argument from > const char **argv. Ack. Definitely copy-paste error. > > Signed-off-by: Christian Couder <chriscool@tuxfamily.org> > --- > t/helper/test-ref-store.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/t/helper/test-ref-store.c b/t/helper/test-ref-store.c > index e9e0541276..799fc00aa1 100644 > --- 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; > -- > 2.20.1.26.gc246996f60 >
On Mon, Jan 7, 2019 at 1:53 PM Duy Nguyen <pclouds@gmail.com> wrote: > > On Sun, Jan 6, 2019 at 10:46 PM Christian Couder > <christian.couder@gmail.com> wrote: > > > > It looks like it is a copy-paste error made in 80f2a6097c > > (t/helper: add test-ref-store to test ref-store functions, > > 2017-03-26) to pass "old-sha1" instead of "new-sha1" to > > notnull() when we get the new sha1 argument from > > const char **argv. > > Ack. Definitely copy-paste error. Thanks for confirming. Junio, it looks like the patch has fallen through the cracks. Or maybe I should rework the commit message?
Christian Couder <christian.couder@gmail.com> writes: > On Mon, Jan 7, 2019 at 1:53 PM Duy Nguyen <pclouds@gmail.com> wrote: >> >> On Sun, Jan 6, 2019 at 10:46 PM Christian Couder >> <christian.couder@gmail.com> wrote: >> > >> > It looks like it is a copy-paste error made in 80f2a6097c >> > (t/helper: add test-ref-store to test ref-store functions, >> > 2017-03-26) to pass "old-sha1" instead of "new-sha1" to >> > notnull() when we get the new sha1 argument from >> > const char **argv. >> >> Ack. Definitely copy-paste error. > > Thanks for confirming. > > Junio, it looks like the patch has fallen through the cracks. Indeed. I did notice two smallish cleanups from you but did not spot this one. Will take a look and queue. Thanks. > > Or maybe I should rework the commit message?
diff --git a/t/helper/test-ref-store.c b/t/helper/test-ref-store.c index e9e0541276..799fc00aa1 100644 --- 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;
It looks like it is a copy-paste error made in 80f2a6097c (t/helper: add test-ref-store to test ref-store functions, 2017-03-26) to pass "old-sha1" instead of "new-sha1" to notnull() when we get the new sha1 argument from const char **argv. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> --- t/helper/test-ref-store.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)