From mboxrd@z Thu Jan 1 00:00:00 1970 From: Justin Lebar Subject: [PATCH 4/4] Fix misuses of "nor" outside comments and in tests Date: Thu, 20 Mar 2014 15:16:25 -0700 Message-ID: <1395353785-23611-5-git-send-email-jlebar@google.com> References: <1395353785-23611-1-git-send-email-jlebar@google.com> Cc: Justin Lebar , Richard Hansen , "Shawn O. Pearce" , Jeff King , Jonathan Nieder , Justin Lebar To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Thu Mar 20 23:46:40 2014 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 1WQljT-0007HJ-JO for gcvg-git-2@plane.gmane.org; Thu, 20 Mar 2014 23:46:40 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759837AbaCTWqf (ORCPT ); Thu, 20 Mar 2014 18:46:35 -0400 Received: from mail-yh0-f74.google.com ([209.85.213.74]:46009 "EHLO mail-yh0-f74.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759697AbaCTWqe (ORCPT ); Thu, 20 Mar 2014 18:46:34 -0400 Received: by mail-yh0-f74.google.com with SMTP id f10so191981yha.5 for ; Thu, 20 Mar 2014 15:46:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=MzB6e/KmrZc1x9WiGIHj2unNbN95H+ABJH3VpngLdtg=; b=PuZdDe5kideZmGIjSGV8Q2pV0af4+8QCh8SySzb7Pkz7FbUi1fixjP+7TWvoZXssCy 2PnDXb2gt6UhpWnW3QGnu685KVehDLPB2gvaekkjZzZRW2IChYjpsP/WZ9aMoruZSXEW SXq5gozBqq3L7f1WRUF1XzW9pJjyl/QcIf8pAxoxBLZX6Ej4mgxvimgthnsE8pmqtgRr s8O1dB3cueI+9tz5McvsLG89Sb0RMQWTLQH/RkWss/irNe34duQfaTgB38iyQ5UpV2As QPxKKHJ8u7+DWO13dQLBnM28hWxAz+ZzOV6/GrKVwvewnSQWy6AfiOiXXaUVx9bEfO2L SW9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=MzB6e/KmrZc1x9WiGIHj2unNbN95H+ABJH3VpngLdtg=; b=FBw7o2vH4lzQ3xlguEoMKUlr9tzvkyVL/fYK8bN9ge5OgB27iMy7bqt+voXY/hIaIr VzjOzf5ZxfzF4nhPkusOjI0N/0EfSTXBGC85FcbgncUZmy7UQf7Z0ex8LW6Q9dxWLubQ aHt9zo5jcQSq5iIa2uLK9fgwpnhu9JIQPZtPyZq+RlpK7vtMuByJoYCvLA2niE3L+laW d6b9oQvLVfo7GeM5xdQMM6TR7T6mnaxKff/HlBDPxZY+YH1ku5VqK4Qj5S6qwm4byd+T wEVLUpcXBsIQNypriiLNMo5TsFgVo6T9SaIdbX2nXpvCwfHBM0oWq4jsMJQdrafkxH7u P/Fg== X-Gm-Message-State: ALoCoQnAw/OP62ewFHl0QNfAOogFqARe4EDaMUro1Gij5vJxjCZidhDr2nqXomW39qPnA996JXssytYzKVtEmTioNqt5N8TFGoViOWlQ0hRcmTsKhCsCmE1vibiy6AAIR2XyjgGiz1Pas0xHCTIbuHMohqDhux1zpgNGCj6NFsqumJsb9xyzJFHtRx9aOPGBAnQ8RcXCBObb X-Received: by 10.52.61.197 with SMTP id s5mr3236908vdr.8.1395353819914; Thu, 20 Mar 2014 15:16:59 -0700 (PDT) Received: from corp2gmr1-2.hot.corp.google.com (corp2gmr1-2.hot.corp.google.com [172.24.189.93]) by gmr-mx.google.com with ESMTPS id x22si403914yhd.5.2014.03.20.15.16.59 for (version=TLSv1.1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 20 Mar 2014 15:16:59 -0700 (PDT) Received: from jlebar0.mtv.corp.google.com (jlebar0.mtv.corp.google.com [172.17.132.58]) by corp2gmr1-2.hot.corp.google.com (Postfix) with ESMTP id AADF15A422C; Thu, 20 Mar 2014 15:16:59 -0700 (PDT) Received: by jlebar0.mtv.corp.google.com (Postfix, from userid 214119) id 6EFD31A1653; Thu, 20 Mar 2014 15:16:59 -0700 (PDT) X-Mailer: git-send-email 1.9.0.279.gdc9e3eb In-Reply-To: <1395353785-23611-1-git-send-email-jlebar@google.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Signed-off-by: Justin Lebar --- builtin/clean.c | 6 +++--- builtin/commit.c | 2 +- git-add--interactive.perl | 4 ++-- perl/Git/SVN.pm | 4 ++-- sha1_file.c | 2 +- t/t1001-read-tree-m-2way.sh | 2 +- t/t4005-diff-rename-2.sh | 2 +- t/t4009-diff-rename-4.sh | 2 +- t/t5304-prune.sh | 2 +- t/t6036-recursive-corner-cases.sh | 2 +- t/t7104-reset.sh | 2 +- t/t9400-git-cvsserver-server.sh | 2 +- 12 files changed, 16 insertions(+), 16 deletions(-) diff --git a/builtin/clean.c b/builtin/clean.c index 5502957..977a068 100644 --- a/builtin/clean.c +++ b/builtin/clean.c @@ -903,11 +903,11 @@ int cmd_clean(int argc, const char **argv, const char *prefix) if (!interactive && !dry_run && !force) { if (config_set) - die(_("clean.requireForce set to true and neither -i, -n nor -f given; " + die(_("clean.requireForce set to true and neither -i, -n, nor -f given; " "refusing to clean")); else - die(_("clean.requireForce defaults to true and neither -i, -n nor -f given; " - "refusing to clean")); + die(_("clean.requireForce defaults to true and neither -i, -n, nor -f given;" + " refusing to clean")); } if (force > 1) diff --git a/builtin/commit.c b/builtin/commit.c index 26b2986..5d594a4 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -1123,7 +1123,7 @@ static int parse_and_validate_options(int argc, const char *argv[], if (argc == 0 && only && amend) only_include_assumed = _("Clever... amending the last one with dirty index."); if (argc > 0 && !also && !only) - only_include_assumed = _("Explicit paths specified without -i nor -o; assuming --only paths..."); + only_include_assumed = _("Explicit paths specified without -i or -o; assuming --only paths..."); if (!cleanup_arg || !strcmp(cleanup_arg, "default")) cleanup_mode = use_editor ? CLEANUP_ALL : CLEANUP_SPACE; else if (!strcmp(cleanup_arg, "verbatim")) diff --git a/git-add--interactive.perl b/git-add--interactive.perl index 24bb1ab..32c2f9c 100755 --- a/git-add--interactive.perl +++ b/git-add--interactive.perl @@ -1156,9 +1156,9 @@ sub help_patch_cmd { print colored $help_color, <