diff options
author | Junio C Hamano <gitster@pobox.com> | 2013-03-21 14:06:55 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-03-21 14:06:55 -0700 |
commit | 328455fc588d8b5a9357f9b1c053cfffc8577e15 (patch) | |
tree | 6ec5156e994fa69d302fcaae48366c8b1b2c71bc /transport.c | |
parent | 28ed8d7be9363a19ea74626d5c84dffbfa959787 (diff) | |
parent | c9fc4415e2c7d7673cdad34d41114ede3435a395 (diff) | |
download | git-328455fc588d8b5a9357f9b1c053cfffc8577e15.tar.gz |
Merge branch 'maint'
* maint:
diff.c: diff.renamelimit => diff.renameLimit in message
wt-status: fix possible use of uninitialized variable
fast-import: clarify "inline" logic in file_change_m
run-command: always set failed_errno in start_command
transport: drop "int cmp = cmp" hack
drop some obsolete "x = x" compiler warning hacks
fast-import: use pointer-to-pointer to keep list tail
Diffstat (limited to 'transport.c')
-rw-r--r-- | transport.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/transport.c b/transport.c index bd290fa7d3..6f671c6506 100644 --- a/transport.c +++ b/transport.c @@ -106,7 +106,7 @@ static void insert_packed_refs(const char *packed_refs, struct ref **list) return; for (;;) { - int cmp = cmp, len; + int cmp, len; if (!fgets(buffer, sizeof(buffer), f)) { fclose(f); |