]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
.gitignore: allow debian .patch files 18154/head
authorKen Dreyer <kdreyer@redhat.com>
Thu, 7 Sep 2017 17:07:59 +0000 (11:07 -0600)
committerKen Dreyer <kdreyer@redhat.com>
Fri, 6 Oct 2017 15:06:41 +0000 (09:06 -0600)
The Ubuntu packaging layout with git-buildpackage assumes a
"debian/patches/" directory with several .patch files in it.

When upstream's .gitignore tells Git to ignore .patch files, we have to
edit that line out downstream. When we forget to do that downstream, it
can lead to missing patches and broken downstream builds.

Allow patches in the /debian/patches directory so it's easier to
maintain an Ubuntu package based on upstream's Git repo.

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
(cherry picked from commit c734b0c0296152721b658af7b699a64b3a49d251)

.gitignore

index 9a0cd9f0a155ddb9eb28b6a89dfa59ddf574b90c..7d42fb41f1934e226cc1495ca243ae8439d8b75d 100644 (file)
@@ -15,6 +15,7 @@
 *.tmp
 *.orig
 *.patch
+!debian/patches/*.patch
 *.rej
 *.rpm
 *.pyc