]> git.eshelyaron.com Git - emacs.git/commit
projects / emacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 205223f) | patch
epatch: Save right backups in Git multipatches
authorTino Calancha <tino.calancha@gmail.com>
Tue, 21 Mar 2017 08:25:55 +0000 (17:25 +0900)
committerTino Calancha <tino.calancha@gmail.com>
Tue, 21 Mar 2017 08:25:55 +0000 (17:25 +0900)
commitabe731eef0fcbc59ef4836e06f6099ea17042b90
tree6611bae15f92a0451acf7ce02128cab09d6dfb95tree | snapshot
parent205223f4725864e1fb53df5cd12694d0bc89f7d0commit | diff
epatch: Save right backups in Git multipatches

Multipatches on N Git files save wrong backups for
N-1 files; only the last one has a correct backup (Bug#26084).
* lisp/vc/diff-mode.el (diff-file-junk-re): Add 'Prereq: '
* lisp/vc/ediff-ptch.el (ediff-map-patch-buffer): Use 'diff-file-junk-re'.
* test/lisp/vc/ediff-ptch-tests.el (ediff-ptch-test-bug25010):
Rename from ibuffer-test-bug25010.
(ediff-ptch-test-bug26084): New test.
lisp/vc/diff-mode.el diff | blob | history
lisp/vc/ediff-ptch.el diff | blob | history
test/lisp/vc/ediff-ptch-tests.el diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.