checkout_merged(): squelch false warning from some gcc
gcc 4.6.2 (there may be others) does not realize that the variable "mode" can never be used uninitialized in this function and issues a false warning under -Wuninitialized option. Squelch it with an unnecessary initialization; it is not like a single assignment matters to the performance in this codepath that writes out to the filesystem with checkout_entry() anyway. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Dec 15, 2011 at 10:10 UTC
335c6e403d862913846661638af6e184055f6db5
1 file changed
+1
-1
builtin/checkout.c
+1
-1
@@ -152,7 +152,7 @@ static int checkout_merged(int pos, struct checkout *state)
152
unsigned char sha1[20];
153
mmbuffer_t result_buf;
154
unsigned char threeway[3][20];
155
- unsigned mode;
155
+ unsigned mode = 0;
156
157
memset(threeway, 0, sizeof(threeway));
158
while (pos < active_nr) {