mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use SWAP macro

Browse Source 
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>
This commit is contained in:
René Scharfe
2017-01-28 22:40:58 +01:00
committed by Junio C Hamano
parent db10199141
commit 35d803bc9a
11 changed files with 15 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
merge-recursive.c
View File

@ -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)