On Thu, Mar 3, 2016 at 12:24 PM, Matthieu Moy <Matthieu.Moy@xxxxxxxxxxxxxxx> wrote: > Mehul Jain <mehul.jain2029@xxxxxxxxx> writes: >> + else { >> + /* If --[no-]autostash option is called without --rebase */ >> + if (opt_autostash == 0) >> + die(_("--no-autostash option is only valid with --rebase.")); >> + else if (opt_autostash == 1) > > The else is not needed since the other branch dies. A couple other minor comments (to be considered or ignored): The comment "/* If --[no-]autostash ... */" merely repeats what the code itself already says, thus is not really helpful and can be dropped. It would be reasonable to combine the two cases into one: if (opt_autostash != -1) die(_("--[no]-autostash option is only valid with --rebase.")); -- 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