From 8ac258a499a5d034684d47c6144be82b87535c24 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Mon, 16 Jan 2017 01:05:37 +0000 Subject: gitattributes: Suppress transformations in ud We want all of our own manipulations to be unaffected by gitattributes transformations, so that the imported git *trees* are identical to the source packages. (Ie, if transformations are in effect, the *checkout* of such a tree might not be identical to the source package.) Signed-off-by: Ian Jackson --- dgit | 1 + dgit.7 | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/dgit b/dgit index ede7010..0df3f75 100755 --- a/dgit +++ b/dgit @@ -1698,6 +1698,7 @@ sub mktree_in_ud_here () { runcmd qw(git config gc.auto 0); rmtree('.git/objects'); symlink '../../../../objects','.git/objects' or die $!; + setup_gitattrs(); } sub git_write_tree () { diff --git a/dgit.7 b/dgit.7 index 284fcf6..c3e5818 100644 --- a/dgit.7 +++ b/dgit.7 @@ -211,6 +211,10 @@ These transformations are context-sensitive and not, in general, reversible, so dgit operates on the principle that the dgit git history contains the actual contents of the package. +(When dgit is manipulating a .dsc, +it does so in a private area, +where the transforming gitattributes are defused (disabled), +to achieve this.) If transforming gitattributes used, they can cause trouble, -- cgit v1.2.3