From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Tino Calancha Newsgroups: gmane.emacs.bugs Subject: bug#26084: 24.5; epatch save wrong backups in Git multipatches Date: Tue, 21 Mar 2017 17:29:29 +0900 Message-ID: <871str9gnq.fsf@calancha-pc> References: <87h92xdzli.fsf@calancha-pc> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: blaine.gmane.org 1490085022 32323 195.159.176.226 (21 Mar 2017 08:30:22 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Tue, 21 Mar 2017 08:30:22 +0000 (UTC) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.0.50 (gnu/linux) To: 26084-done@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Tue Mar 21 09:30:16 2017 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cqFBF-0007U3-65 for geb-bug-gnu-emacs@m.gmane.org; Tue, 21 Mar 2017 09:30:13 +0100 Original-Received: from localhost ([::1]:37216 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cqFBJ-0003tK-Ie for geb-bug-gnu-emacs@m.gmane.org; Tue, 21 Mar 2017 04:30:17 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:36310) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cqFBB-0003re-G0 for bug-gnu-emacs@gnu.org; Tue, 21 Mar 2017 04:30:10 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cqFB5-0005yX-OY for bug-gnu-emacs@gnu.org; Tue, 21 Mar 2017 04:30:09 -0400 Original-Received: from debbugs.gnu.org ([208.118.235.43]:38966) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cqFB5-0005yS-LG for bug-gnu-emacs@gnu.org; Tue, 21 Mar 2017 04:30:03 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1cqFB5-0003FQ-Ec for bug-gnu-emacs@gnu.org; Tue, 21 Mar 2017 04:30:03 -0400 Resent-From: Tino Calancha Original-Sender: "Debbugs-submit" Resent-To: bug-gnu-emacs@gnu.org Resent-Date: Tue, 21 Mar 2017 08:30:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 26084 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Mail-Followup-To: 26084@debbugs.gnu.org, tino.calancha@gmail.com, tino.calancha@gmail.com Original-Received: via spool by 26084-done@debbugs.gnu.org id=D26084.149008498412423 (code D ref 26084); Tue, 21 Mar 2017 08:30:03 +0000 Original-Received: (at 26084-done) by debbugs.gnu.org; 21 Mar 2017 08:29:44 +0000 Original-Received: from localhost ([127.0.0.1]:37163 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cqFAl-0003EJ-SK for submit@debbugs.gnu.org; Tue, 21 Mar 2017 04:29:44 -0400 Original-Received: from mail-pg0-f53.google.com ([74.125.83.53]:35023) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cqFAj-0003E5-26 for 26084-done@debbugs.gnu.org; Tue, 21 Mar 2017 04:29:41 -0400 Original-Received: by mail-pg0-f53.google.com with SMTP id t143so24809137pgb.2 for <26084-done@debbugs.gnu.org>; Tue, 21 Mar 2017 01:29:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:in-reply-to:references:user-agent:date:message-id :mime-version; bh=uzGPF5p3YiFRaEHtgi3sqP2fc6no7GpTLVJr6nWL5xQ=; b=JahbRn3904uTvj0uUjlXWGj32A9OLs1meE3P0h5LqQa6EyI707MPhXe/mXdJ7R6UAv A3klg615j/3bMghSfjJE5J5ZveyIhj1YwDi5VELbjMEnllIEyJ/9PyVTjvx1+tOuifkj ULm9Lf9w7jVhBJg6lRnomv23Tvw+aKj6iBaAiEbe+ZDjyWfOkXfs1S3sjYNGfOtsYPNh IaJJvF+jvebNh4axbDd/FVOlnjALH3SIDPROUlYO+ZdAXrONs9XtGHqs+sz1CWOiCryG isQ+kGGe8kPAArrLa8HkVZCWCFzWTrZEtvx0iaeUzZz/+r4ktd7OWdznjxKsYwgAlo88 qVrw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:in-reply-to:references :user-agent:date:message-id:mime-version; bh=uzGPF5p3YiFRaEHtgi3sqP2fc6no7GpTLVJr6nWL5xQ=; b=ZwA2PbKJRyZ2vUwM0x4AdajmN99aJVOKtRsq+DOV1Ntk+wfnoUVbReS/Vgpk52XN5l mqu08DFWixs0/EuKw4UZBkv0fvk/2jzLL6jRXwiv3War1OH+m0x0tvn/COSOOlKYZmMF 3tAt52unW2BJPmZQrLIxqywTnjdHntOuIBMrCGTvxdqSCNAy5M9oKorCImN4fk7PHqcZ ba2ZZZVsuPhviJIcTupE9rRV0KrAemZPU7aERy2XnJHDflYcoDDlrBm4mm6xMkdt+FBB R/FewOKCac/C3pJDbDd8HlVqAKV4iU4TEjspDXVxf9kCreIxcwZCy97Av6IALDVkAUrH 6p3A== X-Gm-Message-State: AFeK/H2+1yRLbHKdg3xeFL4wo7BOWNZq+GZJYD3zsVdOIIrGOySoZwXs/E45pEZznuUgHQ== X-Received: by 10.99.126.11 with SMTP id z11mr36547650pgc.51.1490084973843; Tue, 21 Mar 2017 01:29:33 -0700 (PDT) Original-Received: from calancha-pc (161.224.128.101.dy.bbexcite.jp. [101.128.224.161]) by smtp.gmail.com with ESMTPSA id f205sm37790665pfa.35.2017.03.21.01.29.32 for <26084-done@debbugs.gnu.org> (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 21 Mar 2017 01:29:33 -0700 (PDT) In-Reply-To: <87h92xdzli.fsf@calancha-pc> (Tino Calancha's message of "Mon, 13 Mar 2017 23:24:09 +0900") X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.org gmane.emacs.bugs:130774 Archived-At: Tino Calancha writes: > emacs -Q /tmp > ;; Eval following form: > (let ((cmd " > mkdir -p foo > cd foo > echo 'qux here' > qux.txt > echo 'bar here' > bar.txt > git init > git add . && git commit -m 'Test repository.' > echo 'foo here' > qux.txt > echo 'foo here' > bar.txt > git diff > ../foo.diff > git reset --hard HEAD > ")) > (call-process-shell-command cmd)) > > M-x epatch RET n /tmp/foo.diff RET /tmp/foo RET n RET q y RET q y q y > ;; Eval this form: > (string= > (with-temp-buffer > (insert-file-contents "/tmp/foo/bar.txt") > (buffer-string)) > (with-temp-buffer > (insert-file-contents > (concat "/tmp/foo/bar.txt" ediff-backup-extension)) > (buffer-string))) > => t ; Should be nil. Pushed fix into master branch as commit: abe731eef0fcbc59ef4836e06f6099ea17042b90