summaryrefslogtreecommitdiff
path: root/dgit
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2017-07-10 11:19:27 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2017-07-18 22:08:43 +0100
commitc697bd52ce3b595cc38bc8385e8a457082c20b8c (patch)
tree8d54fe8865476f49898f973ec4ea8119b84146ec /dgit
parent6fab00d6201f741f87cc89a0a24443db584c4162 (diff)
dgit: simplify gitattrs setup in mktree_in_ud_here
We are going to want to break the meat of mktree_in_ud here out into Dgit.pm. Dgit.pm doesn't have access_cfg, is_gitattrs_setup, and so on. On the other hand, we don't need any of that here: this is a fresh tree of our own (so there is no existing .git/info/attributes to combine with our new settings), and we ignore the config already. So overall, little functional change: the .git/info/attributes in our private working areas are now slightly simpler: they don't indirect via git-defuse-attrs. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'dgit')
-rwxr-xr-xdgit5
1 files changed, 4 insertions, 1 deletions
diff --git a/dgit b/dgit
index 3cf7705..ef60873 100755
--- a/dgit
+++ b/dgit
@@ -1717,7 +1717,10 @@ sub mktree_in_ud_here () {
}
rmtree('.git/objects');
symlink '../../../../objects','.git/objects' or die $!;
- setup_gitattrs(1);
+ ensuredir '.git/info';
+ open GA, "> .git/info/attributes" or die $!;
+ print GA "* $negate_harmful_gitattrs\n" or die $!;
+ close GA or die $!;
}
sub git_write_tree () {