Return-Path: X-Original-To: notmuch@notmuchmail.org Delivered-To: notmuch@notmuchmail.org Received: from localhost (localhost [127.0.0.1]) by arlo.cworth.org (Postfix) with ESMTP id C18266DE1329 for ; Sun, 26 Jul 2015 08:48:17 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at cworth.org X-Spam-Flag: NO X-Spam-Score: 0.164 X-Spam-Level: X-Spam-Status: No, score=0.164 tagged_above=-999 required=5 tests=[AWL=0.164] 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 oaHDFlYxlKvv for ; Sun, 26 Jul 2015 08:48:15 -0700 (PDT) Received: from gitolite.debian.net (gitolite.debian.net [87.98.215.224]) by arlo.cworth.org (Postfix) with ESMTPS id 262616DE0A9A for ; Sun, 26 Jul 2015 08:48:14 -0700 (PDT) Received: from remotemail by gitolite.debian.net with local (Exim 4.80) (envelope-from ) id 1ZJO8R-0004fZ-Kh; Sun, 26 Jul 2015 15:46:43 +0000 Received: (nullmailer pid 22806 invoked by uid 1000); Sun, 26 Jul 2015 15:46:29 -0000 From: David Bremner To: mp39590@gmail.com, notmuch@notmuchmail.org Subject: Re: [PATCH] configure: add --without-docs switch In-Reply-To: <1437850631-30742-1-git-send-email-mp39590@gmail.com> References: <1437850631-30742-1-git-send-email-mp39590@gmail.com> User-Agent: Notmuch/0.20.2 (http://notmuchmail.org) Emacs/24.5.1 (x86_64-pc-linux-gnu) Date: Sun, 26 Jul 2015 17:46:29 +0200 Message-ID: <87oaiysyzu.fsf@maritornes.cs.unb.ca> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.18 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, 26 Jul 2015 15:48:17 -0000 --=-=-= Content-Type: text/plain For some reason I can't apply this patch with git 2.1.4. I think I had the same problem with your last patch but it was only one line. Does it round trip for you? i.e. can you apply the patches you send? I get Applying: configure: add --without-docs switch fatal: git diff header lacks filename information when removing 1 leading pathname component (line 9) Patch failed at 0001 configure: add --without-docs switch I have attached the "extracted" patch, in case it helps someone debug this. --=-=-= Content-Type: application/octet-stream Content-Disposition: attachment; filename=patch Content-Transfer-Encoding: base64 LS0tCiBjb25maWd1cmUgfCAzNiArKysrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0K IDEgZmlsZSBjaGFuZ2VkLCAyMiBpbnNlcnRpb25zKCspLCAxNCBkZWxldGlvbnMoLSkKCmRpZmYg LS1naXQgY29uZmlndXJlIGNvbmZpZ3VyZQppbmRleCBiOTY3YTRlLi5jMDdhNDliIDEwMDc1NQot LS0gY29uZmlndXJlCisrKyBjb25maWd1cmUKQEAgLTY1LDYgKzY1LDcgQEAgUFlUSE9OPSR7UFlU SE9OOi19CiAjIG9wdGlvbnMuCiBQUkVGSVg9L3Vzci9sb2NhbAogTElCRElSPQorV0lUSF9ET0NT PTEKIFdJVEhfRU1BQ1M9MQogV0lUSF9CQVNIPTEKIFdJVEhfWlNIPTEKQEAgLTE0Myw2ICsxNDQs NyBAQCBTb21lIHNwZWNpZmljIGxpYnJhcnkgdmVyc2lvbnMgY2FuIGJlIHNwZWNpZmllZCAoYXV0 by1kZXRlY3RlZCBvdGhlcndpc2UpOgogU29tZSBmZWF0dXJlcyBjYW4gYmUgZGlzYWJsZWQgKC0t d2l0aC1mZWF0dXJlPW5vIGlzIGVxdWl2YWxlbnQgdG8KIC0td2l0aG91dC1mZWF0dXJlKSA6CiAK KwktLXdpdGhvdXQtZG9jcwkJCURvIG5vdCBpbnN0YWxsIGRvY3VtZW50YXRpb24gYW5kIG1hbiBw YWdlcwogCS0td2l0aG91dC1lbWFjcwkJCURvIG5vdCBpbnN0YWxsIGxpc3AgZmlsZQogCS0td2l0 aG91dC1iYXNoLWNvbXBsZXRpb24JRG8gbm90IGluc3RhbGwgYmFzaCBjb21wbGV0aW9ucyBmaWxl cwogCS0td2l0aG91dC16c2gtY29tcGxldGlvbglEbyBub3QgaW5zdGFsbCB6c2ggY29tcGxldGlv bnMgZmlsZXMKQEAgLTE4NSw2ICsxODcsOCBAQCBmb3Igb3B0aW9uOyBkbwogCUJBU0hDT01QTEVU SU9ORElSPSIke29wdGlvbiMqPX0iCiAgICAgZWxpZiBbICIke29wdGlvbiUlPSp9IiA9ICctLXpz aGNvbXBsZXRpb25kaXInIF0gOyB0aGVuCiAJWlNIQ09NTEVUSU9ORElSPSIke29wdGlvbiMqPX0i CisgICAgZWxpZiBbICIke29wdGlvbn0iID0gJy0td2l0aG91dC1kb2NzJyBdIDsgdGhlbgorCVdJ VEhfRE9DUz0wCiAgICAgZWxpZiBbICIke29wdGlvbiUlPSp9IiA9ICctLXdpdGgtZW1hY3MnIF07 IHRoZW4KIAlpZiBbICIke29wdGlvbiMqPX0iID0gJ25vJyBdOyB0aGVuCiAJICAgIFdJVEhfRU1B Q1M9MApAQCAtNDY2LDEzICs0NzAsMTUgQEAgZWxzZQogICAgIGhhdmVfZW1hY3M9MAogZmkKIAot cHJpbnRmICJDaGVja2luZyBpZiBkb3h5Z2VuIGlzIGF2YWlsYWJsZS4uLiAiCi1pZiBjb21tYW5k IC12IGRveHlnZW4gPiAvZGV2L251bGw7IHRoZW4KLSAgICBwcmludGYgIlllcy5cbiIKLSAgICBo YXZlX2RveHlnZW49MQotZWxzZQotICAgIHByaW50ZiAiTm8gKHNvIHdpbGwgbm90IGluc3RhbGwg YXBpIGRvY3MpXG4iCi0gICAgaGF2ZV9kb3h5Z2VuPTAKK2hhdmVfZG94eWdlbj0wCitpZiBbICRX SVRIX0RPQ1MgPSAiMSIgXSA7IHRoZW4KKyAgICBwcmludGYgIkNoZWNraW5nIGlmIGRveHlnZW4g aXMgYXZhaWxhYmxlLi4uICIKKyAgICBpZiBjb21tYW5kIC12IGRveHlnZW4gPiAvZGV2L251bGw7 IHRoZW4KKyAgICAgICAgcHJpbnRmICJZZXMuXG4iCisgICAgICAgIGhhdmVfZG94eWdlbj0xCisg ICAgZWxzZQorICAgICAgICBwcmludGYgIk5vIChzbyB3aWxsIG5vdCBpbnN0YWxsIGFwaSBkb2Nz KVxuIgorICAgIGZpCiBmaQogCiBwcmludGYgIkNoZWNraW5nIGZvciBydWJ5IGRldmVsb3BtZW50 IGZpbGVzLi4uICIKQEAgLTQ4NCwxMyArNDkwLDE1IEBAIGVsc2UKICAgICBoYXZlX3J1YnlfZGV2 PTAKIGZpCiAKLXByaW50ZiAiQ2hlY2tpbmcgaWYgc3BoaW54IGlzIGF2YWlsYWJsZSBhbmQgc3Vw cG9ydHMgbnJvZmYgb3V0cHV0Li4uICIKLWlmIGNvbW1hbmQgLXYgc3BoaW54LWJ1aWxkID4gL2Rl di9udWxsICYmICR7cHl0aG9ufSAtbSBzcGhpbngud3JpdGVycy5tYW5wYWdlID4gL2Rldi9udWxs IDI+JjEgOyB0aGVuCi0gICAgcHJpbnRmICJZZXMuXG4iCi0gICAgaGF2ZV9zcGhpbng9MQotZWxz ZQotICAgIHByaW50ZiAiTm8gKHNvIHdpbGwgbm90IGluc3RhbGwgbWFuIHBhZ2VzKS5cbiIKLSAg ICBoYXZlX3NwaGlueD0wCitoYXZlX3NwaGlueD0wCitpZiBbICRXSVRIX0RPQ1MgPSAiMSIgXSA7 IHRoZW4KKyAgICBwcmludGYgIkNoZWNraW5nIGlmIHNwaGlueCBpcyBhdmFpbGFibGUgYW5kIHN1 cHBvcnRzIG5yb2ZmIG91dHB1dC4uLiAiCisgICAgaWYgY29tbWFuZCAtdiBzcGhpbngtYnVpbGQg PiAvZGV2L251bGwgJiYgJHtweXRob259IC1tIHNwaGlueC53cml0ZXJzLm1hbnBhZ2UgPiAvZGV2 L251bGwgMj4mMSA7IHRoZW4KKyAgICAgICAgcHJpbnRmICJZZXMuXG4iCisgICAgICAgIGhhdmVf c3BoaW54PTEKKyAgICBlbHNlCisgICAgICAgIHByaW50ZiAiTm8gKHNvIHdpbGwgbm90IGluc3Rh bGwgbWFuIHBhZ2VzKS5cbiIKKyAgICBmaQogZmkKIAogbGliZGlyX2luX2xkY29uZmlnPTAKLS0g CjIuNC42CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpu b3RtdWNoIG1haWxpbmcgbGlzdApub3RtdWNoQG5vdG11Y2htYWlsLm9yZwpodHRwOi8vbm90bXVj aG1haWwub3JnL21haWxtYW4vbGlzdGluZm8vbm90bXVjaAo= --=-=-=--