diff options
| author | René Scharfe <l.s.r@web.de> | 2017-01-28 22:40:58 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-01-30 14:17:00 -0800 |
| commit | 35d803bc9a0d21c36b1381f6e42455beeb73b715 (patch) | |
| tree | 045fa1fa1b75d7477bcd6e49f9ea2a75a9211732 /merge-recursive.c | |
| parent | db101991414f4e14b3763b4843dddcca6b31b40b (diff) | |
| download | git-35d803bc9a0d21c36b1381f6e42455beeb73b715.tar.gz git-35d803bc9a0d21c36b1381f6e42455beeb73b715.tar.xz | |
use SWAP macro
Apply the semantic patch swap.cocci to convert hand-rolled swaps to use
the macro SWAP. The resulting code is shorter and easier to read, the
object code is effectively unchanged.
The patch for object.c had to be hand-edited in order to preserve the
comment before the change; Coccinelle tried to eat it for some reason.
Signed-off-by: Rene Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.c')
| -rw-r--r-- | merge-recursive.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index d32720944..b7ff1ada3 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -1390,14 +1390,11 @@ static int process_renames(struct merge_options *o, branch1 = o->branch1; branch2 = o->branch2; } else { - struct rename *tmp; renames1 = b_renames; renames2Dst = &a_by_dst; branch1 = o->branch2; branch2 = o->branch1; - tmp = ren2; - ren2 = ren1; - ren1 = tmp; + SWAP(ren2, ren1); } if (ren1->processed) |