diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-03-22 01:06:55 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-03-22 01:06:55 +0400 |
| commit | 328455fc588d8b5a9357f9b1c053cfffc8577e15 (patch) | |
| tree | 6ec5156e994fa69d302fcaae48366c8b1b2c71bc /builtin | |
| parent | 28ed8d7be9363a19ea74626d5c84dffbfa959787 (diff) | |
| parent | c9fc4415e2c7d7673cdad34d41114ede3435a395 (diff) | |
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 'builtin')
| -rw-r--r-- | builtin/cat-file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/cat-file.c b/builtin/cat-file.c index 00528ddc38..ad29000736 100644 --- a/builtin/cat-file.c +++ b/builtin/cat-file.c @@ -193,7 +193,7 @@ static int batch_one_object(const char *obj_name, int print_contents) unsigned char sha1[20]; enum object_type type = 0; unsigned long size; - void *contents = contents; + void *contents; if (!obj_name) return 1; |