From: Matthieu Moy Date: Fri, 04 Mar 2016 06:51:40 GMT Subject: Re: [PATCH v3 1/3] pull --rebase: add --[no-]autostash flag Message-ID: In-Reply-To: Mehul Jain writes: > On Thu, Mar 3, 2016 at 10:54 PM, Matthieu Moy > wrote: >> Mehul Jain 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. > > I'm bit confused here. Which "else" you are talking about. The last "else" keyword. Not the "else" branch. It would just work like this, and be a bit more pleasing to my eyes: if (...) die(...); if (...) die(...); -- Matthieu Moy http://www-verimag.imag.fr/~moy/