Hi Guido, Guido Günther wrote:
> As I wrote I dropped -i and -I from git-pbuilder with the last upload. > However this broke the 1.0 source format build (since they don't exclude > .git automatically), so I went for this: > > http://git.debian.org/?p=users/agx/git-buildpackage.git;a=commit;h=033f359f5c65ae02d81410320c0f2f77ea54ff3b > > Any thoughts on this solution? It makes sense to me. The following is an alternative but I think what you did is better. -- >8 -- Subject: git-pbuilder: extend diff-ignore pattern unconditionally By using --extend-diff-ignore instead of -i to set diff-ignore patterns, we can request the same behavior with dpkg source formats 1.0 and 3.0. The downsides don't make this look so good: it involves a dependency on dpkg from squeeze and the default patterns requested with -i might include false positives. --- git-pbuilder | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff --git a/git-pbuilder b/git-pbuilder index b18b7a8..ee5d89f 100755 --- a/git-pbuilder +++ b/git-pbuilder @@ -98,12 +98,8 @@ update|create|login) ;; esac -if [ ! -f debian/source/format ] || grep -qs "^1.0" debian/source/format; then - echo "Source format 1.0 detected, adding excludes" - DEBBUILDOPTS="-i'(?:^|/)\\.git(attributes)?(?:\$|/.*\$)' -I.git $*" -else - DEBBUILDOPTS="$*" -fi +DEBBUILDOPTS="--extend-diff-ignore='(?:^|/)\\.git(attributes)?(?:\$|/.*\$)'" +DEBBUILDOPTS="$DEBBUILDOPTS -I.git -i $*" # Now we can finally run pdebuild. The quoting here is tricky, but this # seems to pass everything through properly. -- 1.7.5.1 -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
