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 /wt-status.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 'wt-status.c')
| -rw-r--r-- | wt-status.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/wt-status.c b/wt-status.c index 7bb3f63f06..54f4391f9c 100644 --- a/wt-status.c +++ b/wt-status.c @@ -264,7 +264,7 @@ static void wt_status_print_change_data(struct wt_status *s, { struct wt_status_change_data *d = it->util; const char *c = color(change_type, s); - int status = status; + int status; char *one_name; char *two_name; const char *one, *two; @@ -292,6 +292,9 @@ static void wt_status_print_change_data(struct wt_status *s, } status = d->worktree_status; break; + default: + die("BUG: unhandled change_type %d in wt_status_print_change_data", + change_type); } one = quote_path(one_name, -1, &onebuf, s->prefix); |