global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-14 02:43:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'jc/checkout-m-twoway' into next

Browse Source 
* jc/checkout-m-twoway:
  checkout_merged(): squelch false warning from some gcc
This commit is contained in:
Junio C Hamano
2011-12-15 14:12:40 -08:00
parent da9c9d7fbc 335c6e403d
commit cc64fed1a3
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/checkout.c
View File

@@ -157,7 +157,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) {