From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by arlo.cworth.org (Postfix) with ESMTP id 1F3B76DE0ACB for ; Sun, 22 Oct 2017 01:50:42 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at cworth.org X-Spam-Flag: NO X-Spam-Score: 0.019 X-Spam-Level: X-Spam-Status: No, score=0.019 tagged_above=-999 required=5 tests=[AWL=0.039, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01] autolearn=disabled Received: from arlo.cworth.org ([127.0.0.1]) by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 4ay_OTXj6Ll7 for ; Sun, 22 Oct 2017 01:50:40 -0700 (PDT) Received: from mail-lf0-f45.google.com (mail-lf0-f45.google.com [209.85.215.45]) by arlo.cworth.org (Postfix) with ESMTPS id 8F4486DE0A9A for ; Sun, 22 Oct 2017 01:50:40 -0700 (PDT) Received: by mail-lf0-f45.google.com with SMTP id 75so17051412lfx.1 for ; Sun, 22 Oct 2017 01:50:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nikula-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:in-reply-to:references:date:message-id :mime-version:content-transfer-encoding; bh=yMxqQ+uHI+wiVO01eqc8Wa9p/3ImrF8dv3ogZsVMCZ4=; b=gn/WRFQ16ySffT2xFAZgdg63Y/KiGf5Bjy4nwADQbfW+upd9GkhvYF4B7tvxjmRoft Y1PTuDfgF8zQCnrcooUYRxg4nDEVo0p50nV9LnjmXrmOyee+ejS0fqPxamrVckDvs95W OrWUC2LYIatv2r3IcM0117n0O3YkAwe7EC9MxPYaKuMpTuXXLQ/HAouiCfuFGJEdl0FZ hnCdF1UOCWyx6ykJ97detpYsrK2bMC8Qb8CrC/1WY41itGvs0ZL/YAXfFeWT09OZSy4r nJXL+4uM9OeVQVXMD9V9tVN95GuL5qaWhs+JJcqH8ApT+be1Q2ep15Mg4XYQHpyWqPa+ huRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:in-reply-to:references:date :message-id:mime-version:content-transfer-encoding; bh=yMxqQ+uHI+wiVO01eqc8Wa9p/3ImrF8dv3ogZsVMCZ4=; b=MOZifp/dCIPXUKVMLOePazYlIerJzkzY3Xq3zFlFq54sK4smaUTbQmQJgwwZmpeZyR Dh1AEJN46IcU6oPG1D9her8S/57uxO7uz746hRR60wDGmLQjcxzqnc+69QqgmjdYfUkC O/vV7UtLhn75n9kPorCz3wCS6HwcnFjYbMyc6Ht9J6C+rG3WTpOhuOmRDSL2LKSby5Ih 4fCgNdkvSE7f3N0D6Xp8Nz/lVh1OwsLy5ogqXiOgqzi+uV3LRg4zJeds997+7w+iaesc 8/cGzxPPYNoECOZpo8M0Se2tbI6cnzRt+6P5KteDPmcMWEdfphvWBGaFrYbFJv+9uWSl io9Q== X-Gm-Message-State: AMCzsaWovR/eLW/M2FI/TYu1NDHEfCDGSRNRQMCtlf1bXcalW/FCMeuA cPbkZO5bLp4dDPKoNuVhOep1gA== X-Google-Smtp-Source: ABhQp+Slp2obofElbedCpwXWLMJy1Gt/60bwDMh3cEF3S514eCOcDl2LJbkOaPsOxxtKkk4YurYF7w== X-Received: by 10.25.143.156 with SMTP id s28mr3491111lfk.236.1508662238518; Sun, 22 Oct 2017 01:50:38 -0700 (PDT) Received: from localhost (mobile-access-5d6a0c-19.dhcp.inet.fi. [93.106.12.19]) by smtp.gmail.com with ESMTPSA id i27sm1104087ljb.38.2017.10.22.01.50.36 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 22 Oct 2017 01:50:37 -0700 (PDT) From: Jani Nikula To: "W. Trevor King" , David Bremner Cc: notmuch@notmuchmail.org Subject: Re: nmbug backtrace due to .mailmap In-Reply-To: <20171016213556.GA26354@valgrind.us> References: <87lgkasy5b.fsf@nikula.org> <20171016192115.GE11004@valgrind.tremily.us> <871sm2bzhv.fsf@tesseract.cs.unb.ca> <20171016210817.GF11004@valgrind.tremily.us> <20171016213556.GA26354@valgrind.us> Date: Sun, 22 Oct 2017 11:50:33 +0300 Message-ID: <87inf7efc6.fsf@nikula.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 22 Oct 2017 08:50:42 -0000 On Mon, 16 Oct 2017, "W. Trevor King" wrote: > b. Comment out the =E2=80=98_insist_committed()=E2=80=99 line in nmbug's = =E2=80=98pull=E2=80=99 > definition and try again. Make sure you restore the check after > the successful pull. FWIW this fixed it for me, thanks. BR, Jani.