From: Jonathan Nieder Date: Sun, 14 Aug 2011 12:12:44 GMT Subject: Re: [PATCH 4/7] revert: Allow mixed pick and revert instructions Message-ID: <20110814121244.GD18466@elie.gateway.2wire.net> In-Reply-To: <1313310789-10216-5-git-send-email-artagnon@gmail.com> Ramkumar Ramachandra wrote: > if (!prefixcmp(start, "pick ")) { > - action = CHERRY_PICK; > + item->action = REPLAY_PICK; > p += strlen("pick "); > } else if (!prefixcmp(start, "revert ")) { > - action = REVERT; > + item->action = REPLAY_REVERT; > p += strlen("revert "); > - } else > - return NULL; > + } else { > + int len = strchrnul(p, '\n') - p; > + if (len > 255) > + len = 255; > + return error(_("Unrecognized action: %.*s"), len, p); What happens if the current line has more than INT_MAX characters? Maybe it would make sense to factor out a function for this computation, for brevity and so there is just one place to tweak.