Skip to content

Commit 2f0419b

Browse files
committed
Merge branch 'jx/proc-receive-hook' into pu
* jx/proc-receive-hook: SQUASH???
2 parents d5c3488 + 1e4ae42 commit 2f0419b

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

builtin/receive-pack.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -947,13 +947,13 @@ static int read_proc_receive_report(struct packet_reader *reader,
947947
}
948948
if (reader->pktlen > len)
949949
strbuf_addstr(&extended_status, (char *)reader->line + len + 1);
950-
if (oidcmp(&hint->old_oid, &old_oid)) {
950+
if (!oideq(&hint->old_oid, &old_oid)) {
951951
oidcpy(&hint->old_oid, &old_oid);
952952
strbuf_addf(&extended_status, "%sold-oid=%s",
953953
extended_status.len > 0 ? " ": "",
954954
oid_to_hex(&old_oid));
955955
}
956-
if (oidcmp(&hint->new_oid, &new_oid)) {
956+
if (!oideq(&hint->new_oid, &new_oid)) {
957957
oidcpy(&hint->new_oid, &new_oid);
958958
strbuf_addf(&extended_status, "%snew-oid=%s",
959959
extended_status.len > 0 ? " ": "",

transport.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -512,10 +512,8 @@ static void print_ref_status(char flag, const char *summary,
512512
}
513513
fputc('\n', stderr);
514514
}
515-
if (from_name)
516-
free(from_name);
517-
if (to_name)
518-
free(to_name);
515+
free(from_name);
516+
free(to_name);
519517
}
520518

521519
static void print_ok_ref_status(struct ref *ref, int porcelain, int summary_width)

0 commit comments

Comments
 (0)