I mostly use git svn to do Debian kernel stuff. One annoyance with this is that when you want to add/commit a change under /debian/ you have to use -f because the file is in .gitignore (the one which comes from the upstream kernel source). The patch below removes /debian/ from the upstream .gitignore and also adds some further overrides for the debian/patches dir. I could probably achieve this locally via .git/info/excludes but I figure I'm not the only one using git svn so perhaps it is worth having in tree? It would also be correct if/when we eventually switch to git ourselves. Ian. From beec3d327f30c7400294bb80918d06fc59af9f38 Mon Sep 17 00:00:00 2001 From: Ian Campbell <ijc@hellion.org.uk> Date: Mon, 7 Jan 2013 14:28:06 +0000 Subject: [PATCH] gitignore adjustments --- linux/debian/.gitignore | 4 ++++ linux/debian/patches/debian/gitignore.patch | 18 ++++++++++++++++++ linux/debian/patches/series | 1 + 3 files changed, 23 insertions(+) create mode 100644 linux/debian/.gitignore create mode 100644 linux/debian/patches/debian/gitignore.patch diff --git a/linux/debian/.gitignore b/linux/debian/.gitignore new file mode 100644 index 0000000..91c6278 --- /dev/null +++ b/linux/debian/.gitignore @@ -0,0 +1,4 @@ +!/patches +!*.patch +!*.diff +*.pyc diff --git a/linux/debian/patches/debian/gitignore.patch b/linux/debian/patches/debian/gitignore.patch new file mode 100644 index 0000000..4737513 --- /dev/null +++ b/linux/debian/patches/debian/gitignore.patch @@ -0,0 +1,18 @@ +Debian pkg-kernel using git svn. + +Index: linux/.gitignore +=================================================================== +--- linux.orig/.gitignore 2013-01-06 14:05:25.000000000 +0000 ++++ linux/.gitignore 2013-01-06 14:07:10.000000000 +0000 +@@ -46,11 +46,6 @@ + /Module.symvers + + # +-# Debian directory (make deb-pkg) +-# +-/debian/ +- +-# + # git files that we don't want to ignore even it they are dot-files + # + !.gitignore diff --git a/linux/debian/patches/series b/linux/debian/patches/series index e9f2e4f..910042f 100644 --- a/linux/debian/patches/series +++ b/linux/debian/patches/series @@ -1,6 +1,7 @@ debian/version.patch debian/kernelvariables.patch debian/doc-build-parallel.patch +debian/gitignore.patch features/all/drivers-media-dvb-usb-af9005-request_firmware.patch -- 1.7.10.4 -- Ian Campbell I tripped over a hole that was sticking up out of the ground.
Attachment:
signature.asc
Description: This is a digitally signed message part