summaryrefslogtreecommitdiff
path: root/diff.c
diff options
context:
space:
mode:
authorLibravatar Jonathan Tan <jonathantanmy@google.com>2020-04-02 12:19:16 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-04-02 12:42:32 -0700
commitdb7ed7418b3702ab2b2df755764c3f452917a890 (patch)
tree888b61c185e11fff9b51fec37f8d4ff6c88a8dc1 /diff.c
parentGit 2.26 (diff)
downloadtgif-db7ed7418b3702ab2b2df755764c3f452917a890.tar.xz
promisor-remote: accept 0 as oid_nr in function
There are 3 callers to promisor_remote_get_direct() that first check if the number of objects to be fetched is equal to 0. Fold that check into promisor_remote_get_direct(), and in doing so, be explicit as to what promisor_remote_get_direct() does if oid_nr is 0 (it returns 0, success, immediately). Signed-off-by: Jonathan Tan <jonathantanmy@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diff.c')
-rw-r--r--diff.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/diff.c b/diff.c
index f2cfbf2214..d0f8032456 100644
--- a/diff.c
+++ b/diff.c
@@ -6517,12 +6517,11 @@ void diffcore_std(struct diff_options *options)
add_if_missing(options->repo, &to_fetch, p->one);
add_if_missing(options->repo, &to_fetch, p->two);
}
- if (to_fetch.nr)
- /*
- * NEEDSWORK: Consider deduplicating the OIDs sent.
- */
- promisor_remote_get_direct(options->repo,
- to_fetch.oid, to_fetch.nr);
+ /*
+ * NEEDSWORK: Consider deduplicating the OIDs sent.
+ */
+ promisor_remote_get_direct(options->repo,
+ to_fetch.oid, to_fetch.nr);
oid_array_clear(&to_fetch);
}