[PATCH v7 02/12] tag-util: do not reset list in parse_tag_command_line

diff --git a/9e/acc2c6b9ac58664c8786b411f5096e496a6d8d b/9e/acc2c6b9ac58664c8786b411f5096e496a6d8d
new file mode 100644 (file)
index 0000000..f66a989
--- /dev/null
+++ b/9e/acc2c6b9ac58664c8786b411f5096e496a6d8d
@@ -0,0 +1,102 @@
+Return-Path: <novalazy@gmail.com>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id 6E807429E26\r
+       for <notmuch@notmuchmail.org>; Sat, 22 Jun 2013 21:24:20 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.799\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.799 tagged_above=-999 required=5\r
+       tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
+       FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id UFydAVinQFky for <notmuch@notmuchmail.org>;\r
+       Sat, 22 Jun 2013 21:24:14 -0700 (PDT)\r
+Received: from mail-pa0-f42.google.com (mail-pa0-f42.google.com\r
+       [209.85.220.42]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 0F21C431FD4\r
+       for <notmuch@notmuchmail.org>; Sat, 22 Jun 2013 21:24:05 -0700 (PDT)\r
+Received: by mail-pa0-f42.google.com with SMTP id rl6so9555387pac.29\r
+       for <notmuch@notmuchmail.org>; Sat, 22 Jun 2013 21:24:05 -0700 (PDT)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;\r
+       h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references;\r
+       bh=fPbJUWFiSrZWupnXHqBxKPQz/HP1Yw/teHwqY2oUqs0=;\r
+       b=xhtrdhvolhxG/792yX0FRU9Sx/SxpblyId0Jdms0Lp3s+vCeELAfCKQquIGLK0CInk\r
+       Eg98x1O4I5BHJAXmkM9A/jlj27rE3kOGF4EAjKbMumsYJBi71iyG8lYEQtBGt0QMQ5Kq\r
+       IVtALFWTtstrZH+qwtoOLOLkw8Peeg/nDX+E+hken2IlcaLpfK9Ix4Wcuiv0WVmiQ1pi\r
+       f3V1PE8MnIihXJu/4kO5mD2T3zhgA694bQKp+1b5aguAIn7v3gYJJHjvWgIpYu/MSznU\r
+       KrP1vjM1sfnOV5BnvWNssbcrGutXuzmQYMO2UhtIoswzL8UR5qv8I/Pqi+YgRHmg4sse\r
+       uSiw==\r
+X-Received: by 10.68.219.130 with SMTP id po2mr18802382pbc.68.1371961445332;\r
+       Sat, 22 Jun 2013 21:24:05 -0700 (PDT)\r
+Received: from localhost (215.42.233.220.static.exetel.com.au.\r
+       [220.233.42.215])\r
+       by mx.google.com with ESMTPSA id ep2sm5603965pbb.27.2013.06.22.21.24.03\r
+       for <multiple recipients>\r
+       (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
+       Sat, 22 Jun 2013 21:24:04 -0700 (PDT)\r
+From: Peter Wang <novalazy@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v7 02/12] tag-util: do not reset list in\r
+ parse_tag_command_line\r
+Date: Sun, 23 Jun 2013 14:23:55 +1000\r
+Message-Id: <1371961445-15182-3-git-send-email-novalazy@gmail.com>\r
+X-Mailer: git-send-email 1.7.12.1\r
+In-Reply-To: <1371961445-15182-1-git-send-email-novalazy@gmail.com>\r
+References: <1371961445-15182-1-git-send-email-novalazy@gmail.com>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Sun, 23 Jun 2013 04:24:20 -0000\r
+\r
+The 'insert' command will be better served if parse_tag_command_line\r
+modifies a pre-populated list (of new.tags) instead of clobbering the\r
+list outright.  The sole existing caller, notmuch_tag_command, is\r
+unaffected by this change.\r
+---\r
+ tag-util.c | 2 --\r
+ tag-util.h | 2 ++\r
+ 2 files changed, 2 insertions(+), 2 deletions(-)\r
+\r
+diff --git a/tag-util.c b/tag-util.c\r
+index 92e08a1..3bde409 100644\r
+--- a/tag-util.c\r
++++ b/tag-util.c\r
+@@ -165,8 +165,6 @@ parse_tag_command_line (void *ctx, int argc, char **argv,\r
+ \r
+     int i;\r
+ \r
+-    tag_op_list_reset (tag_ops);\r
+-\r
+     for (i = 0; i < argc; i++) {\r
+       if (strcmp (argv[i], "--") == 0) {\r
+           i++;\r
+diff --git a/tag-util.h b/tag-util.h\r
+index 246de85..4628f16 100644\r
+--- a/tag-util.h\r
++++ b/tag-util.h\r
+@@ -81,6 +81,8 @@ parse_tag_line (void *ctx, char *line,\r
+  * Output Parameters:\r
+  *    ops     contains a list of tag operations\r
+  *    query_str the search terms.\r
++ *\r
++ * The ops argument is not cleared.\r
+  */\r
+ \r
+ tag_parse_status_t\r
+-- \r
+1.7.12.1\r
+\r