diff options
| author |  Junio C Hamano <junkio@cox.net> | 2005-12-26 18:45:30 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-12-26 18:45:30 -0800 |
| commit | 36de72aa9dc3b7daf8cf2770c840f39bb0d2ae70 (patch) | |
| tree | ff61e0bd4d4454a4b34e920f80dbc1b4e427383d /diffcore-order.c | |
| parent | Merge branch 'jc/checkout' (diff) | |
| parent | GIT 1.0.5 (diff) | |
| download | tgif-36de72aa9dc3b7daf8cf2770c840f39bb0d2ae70.tar.xz | |
Merge fixes up to GIT 1.0.5
Diffstat (limited to 'diffcore-order.c')
| -rw-r--r-- | diffcore-order.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/diffcore-order.c b/diffcore-order.c index b38122361f..0bc2b22f84 100644 --- a/diffcore-order.c +++ b/diffcore-order.c @@ -105,9 +105,13 @@ static int compare_pair_order(const void *a_, const void *b_) void diffcore_order(const char *orderfile) { struct diff_queue_struct *q = &diff_queued_diff; - struct pair_order *o = xmalloc(sizeof(*o) * q->nr); + struct pair_order *o; int i; + if (!q->nr) + return; + + o = xmalloc(sizeof(*o) * q->nr); prepare_order(orderfile); for (i = 0; i < q->nr; i++) { o[i].pair = q->queue[i]; |