diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-12-15 18:10:11 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-12-15 18:10:11 (GMT) |
| commit | 335c6e403d862913846661638af6e184055f6db5 (patch) | |
| tree | 306a7ef7ebc572e76f479283efaab98c6c3eaa5d /builtin | |
| parent | 3d0b05176f0539b8d71e712016c367768fc046d5 (diff) | |
| download | git-335c6e403d862913846661638af6e184055f6db5.zip git-335c6e403d862913846661638af6e184055f6db5.tar.gz git-335c6e403d862913846661638af6e184055f6db5.tar.bz2 | |
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>
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/checkout.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/checkout.c b/builtin/checkout.c index 31aa248..064e7a1 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -152,7 +152,7 @@ static int checkout_merged(int pos, struct checkout *state) unsigned char sha1[20]; mmbuffer_t result_buf; unsigned char threeway[3][20]; - unsigned mode; + unsigned mode = 0; memset(threeway, 0, sizeof(threeway)); while (pos < active_nr) { |