On Sat, Feb 22, 2014 at 4:31 PM, Jeff King <peff@xxxxxxxx> wrote:
> On Sat, Feb 22, 2014 at 03:09:22AM +0800, Tay Ray Chuan wrote:
>
>> @@ -1141,7 +1146,12 @@ static int parse_and_validate_options(int argc, const char *argv[],
>> if (all && argc > 0)
>> die(_("Paths with -a does not make sense."));
>>
>> - if (status_format != STATUS_FORMAT_DEFAULT)
>> + if (verbose && !include_status) {
>> + include_status = 1;
>> + status_format = STATUS_FORMAT_NONE;
>> + }
>> +
>> + if (status_format != STATUS_FORMAT_DEFAULT && !verbose)
>> dry_run = 1;
>
> What happens here when there is an alternate status format _and_
> --verbose is used? If I say "git commit --porcelain" it should imply
> --dry-run. But "git commit --porcelain --verbose" no longer does so
> after your patch.
I should have just left the --dry-run inference alone, like this.
-->8--
@@ -1141,7 +1146,12 @@ static int parse_and_validate_options
if (all && argc > 0)
die(_("Paths with -a does not make sense."));
- if (status_format != STATUS_FORMAT_DEFAULT)
+ if (verbose && !include_status) {
+ include_status = 1;
+ status_format = STATUS_FORMAT_NONE;
+ } else if (status_format != STATUS_FORMAT_DEFAULT)
dry_run = 1;
return argc;
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html