From: Ken Dreyer <kdreyer@redhat.com>
Date: Thu, 7 Sep 2017 17:07:59 +0000 (-0600)
Subject: .gitignore: allow debian .patch files
X-Git-Tag: v13.0.1~1007^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F17577%2Fhead;p=ceph.git

.gitignore: allow debian .patch files

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>
---

diff --git a/.gitignore b/.gitignore
index 9a0cd9f0a15..7d42fb41f19 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,6 +15,7 @@
 *.tmp
 *.orig
 *.patch
+!debian/patches/*.patch
 *.rej
 *.rpm
 *.pyc