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 <ijackson@chiark.greenend.org.uk>

diff --git a/dgit b/dgit
index ede7010c9ca2e5bf955841f3e8c81b0db35364fd..0df3f7534a1872b3a11615232679a110ca347b6a 100755 (executable)
--- 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 284fcf65d6ca522ad574fe8f0a041931f8545e55..c3e581853701e1b820d53cdb8be3f52b511cd04b 100644 (file)
--- 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,