From mboxrd@z Thu Jan 1 00:00:00 1970 From: Junio C Hamano Subject: Re: [PATCH] am: replace uses of --resolved with --continue Date: Thu, 27 Jun 2013 09:36:18 -0700 Message-ID: <7vvc4ztssd.fsf@alter.siamese.dyndns.org> References: <1372277201-29324-1-git-send-email-kevin@bracey.fi> <20130627083346.GB2232@serenity.lan> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: Kevin Bracey , git@vger.kernel.org, Jeff King To: John Keeping X-From: git-owner@vger.kernel.org Thu Jun 27 18:36:28 2013 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1UsFBK-0005mH-FY for gcvg-git-2@plane.gmane.org; Thu, 27 Jun 2013 18:36:26 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752643Ab3F0QgW (ORCPT ); Thu, 27 Jun 2013 12:36:22 -0400 Received: from b-pb-sasl-quonix.pobox.com ([208.72.237.35]:63132 "EHLO smtp.pobox.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752435Ab3F0QgV (ORCPT ); Thu, 27 Jun 2013 12:36:21 -0400 Received: from smtp.pobox.com (unknown [127.0.0.1]) by b-sasl-quonix.pobox.com (Postfix) with ESMTP id 0C40929792; Thu, 27 Jun 2013 16:36:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=pobox.com; h=from:to:cc :subject:references:date:in-reply-to:message-id:mime-version :content-type; s=sasl; bh=067unCngAYcNTME3BkSHr8f9mDw=; b=sHIdBJ 7wiYs86SYmwc9sWbBNxNzHcHdvyN945LHiEHwNNyHNllQcRHpkLFz2MNN53It5Pj WbAysUn0dyEXQ5CRCi5bvvCHEoGThgOC4/QYo4lQUaohltgo68kqm0IPUolCXJYw Bu9cnyZll6H0XxKLB9MtybVrEnBgRNCFHpK88= DomainKey-Signature: a=rsa-sha1; c=nofws; d=pobox.com; h=from:to:cc :subject:references:date:in-reply-to:message-id:mime-version :content-type; q=dns; s=sasl; b=r9jQSBb7F+wI60ZlbBQo5y1m+GfKCWfC GEzUJaeFak9nY9Gw2bY9gP92fsxEw71TJ39t2xK1gRM3qm5HuA1aWarQT0LW4aMy H6EB1mAO19ZYc+pzbjm5jY4oh3Ji/BrW36AQjujErJ5T8G8E2WbXAnGTc/53tq+I l6lQeeB1Nc0= Received: from b-pb-sasl-quonix.pobox.com (unknown [127.0.0.1]) by b-sasl-quonix.pobox.com (Postfix) with ESMTP id F3C0C29791; Thu, 27 Jun 2013 16:36:20 +0000 (UTC) Received: from pobox.com (unknown [50.161.4.97]) (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by b-sasl-quonix.pobox.com (Postfix) with ESMTPSA id 724A72978C; Thu, 27 Jun 2013 16:36:20 +0000 (UTC) In-Reply-To: <20130627083346.GB2232@serenity.lan> (John Keeping's message of "Thu, 27 Jun 2013 09:33:46 +0100") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.2 (gnu/linux) X-Pobox-Relay-ID: B27D9250-DF47-11E2-B0B3-E636B1368C5F-77302942!b-pb-sasl-quonix.pobox.com Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: John Keeping writes: >> @@ -176,7 +176,7 @@ aborts in the middle. You can recover from this in one of two ways: >> >> . hand resolve the conflict in the working directory, and update >> the index file to bring it into a state that the patch should >> - have produced. Then run the command with the '--resolved' option. >> + have produced. Then run the command with the '--continue' option. > > It isn't new in this patch, but there is an inconsistency in the quoting > of the options here. In the previous hunk we use backticks but here it > uses SQs. Whatever the user is expected to literally type, like the dashed options, should be typeset in tt so `--continue` is the right form. I am not inviting anybody to throw a patch that was generated by blindly running: sed -e "s/'\(--[a-z_]*\)'/`\1`/g" to touch 50+ files without thinking, by the way. It is so easy that it can even be done by a trained monkey, but it also is very easy to fail to spot misconversion. Done in small batches with a throttled rate of patchflow, we may have sufficient review bandwidth to audit them.