X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=dgit;h=db8d1f72bbbc8ed4aedab90868cc03d21970d6bc;hb=edf2e3761f78147bf4fe4fcb0c23f0c3a227d1c8;hp=4b088dbc316f0e8f2a3fa0d3a922895eadfd3457;hpb=6516b26b1e24241f879b9bde6533d1c8a384c803;p=dgit.git

diff --git a/dgit b/dgit
index 4b088dbc..db8d1f72 100755
--- a/dgit
+++ b/dgit
@@ -34,7 +34,6 @@ use POSIX;
 use IPC::Open2;
 use Digest::SHA;
 use Digest::MD5;
-use List::Util qw(any);
 use List::MoreUtils qw(pairwise);
 use Text::Glob qw(match_glob);
 use Fcntl qw(:DEFAULT :flock);
@@ -144,6 +143,7 @@ our %opts_cfg_insertpos = map {
 } keys %opts_opt_map;
 
 sub parseopts_late_defaults();
+sub setup_gitattrs(;$);
 
 our $keyid;
 
@@ -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 () {
@@ -3316,9 +3317,57 @@ sub ensure_setup_existing_tree () {
     set_local_git_config $k, 'true';
 }
 
+sub open_gitattrs () {
+    my $gai = new IO::File ".git/info/attributes"
+	or $!==ENOENT
+	or die "open .git/info/attributes: $!";
+    return $gai;
+}
+
+sub is_gitattrs_setup () {
+    my $gai = open_gitattrs();
+    return 0 unless $gai;
+    while (<$gai>) {
+	return 1 if m{^\[attr\]dgit-defuse-attrs\s};
+    }
+    $gai->error and die $!;
+    return 0;
+}    
+
+sub setup_gitattrs (;$) {
+    my ($always) = @_;
+    return unless $always || access_cfg_bool(1, 'setup-gitattributes');
+
+    if (is_gitattrs_setup()) {
+	progress <<END;
+[attr]dgit-defuse-attrs already found in .git/info/attributes
+ not doing further gitattributes setup
+END
+	return;
+    }
+    my $af = ".git/info/attributes";
+    open GAO, "> $af.new" or die $!;
+    print GAO <<END or die $!;
+*	dgit-defuse-attrs
+[attr]dgit-defuse-attrs	-text -eol -crlf -ident -filter
+# ^ see dgit(7).  To undo, leave a definition of [attr]dgit-defuse-attrs
+END
+    my $gai = open_gitattrs();
+    if ($gai) {
+	while (<$gai>) {
+	    chomp;
+	    print GAO $_, "\n" or die $!;
+	}
+	$gai->error and die $!;
+    }
+    close GAO or die $!;
+    rename "$af.new", "$af" or die "install $af: $!";
+}
+
 sub setup_new_tree () {
     setup_mergechangelogs();
     setup_useremail();
+    setup_gitattrs();
 }
 
 sub multisuite_suite_child ($$$) {
@@ -6050,6 +6099,13 @@ sub cmd_quilt_fixup {
     build_maybe_quilt_fixup();
 }
 
+sub import_dsc_result {
+    my ($dstref, $newhash, $what_log, $what_msg) = @_;
+    my @cmd = (@git, qw(update-ref -m), $what_log, $dstref, $newhash);
+    runcmd @cmd;
+    progress "dgit: import-dsc: $what_msg";
+}
+
 sub cmd_import_dsc {
     my $needsig = 0;
 
@@ -6146,10 +6202,9 @@ END
 		fail "Not fast forward to $dsc_hash";
 	    }
 	}
-	@cmd = (@git, qw(update-ref -m), "dgit import-dsc (Dgit): $info",
-		$dstbranch, $dsc_hash);
-	runcmd @cmd;
-	progress "dgit: import-dsc updated git ref $dstbranch";
+	import_dsc_result $dstbranch, $dsc_hash,
+	    "dgit import-dsc (Dgit): $info",
+	    "updated git ref $dstbranch";
 	return 0;
     }
 
@@ -6209,10 +6264,9 @@ END
 	}
     }
 
-    my @cmd = (@git, qw(update-ref -m), "dgit import-dsc: $info",
-	       $dstbranch, $newhash);
-    runcmd @cmd;
-    progress "dgit: import-dsc results are in in git ref $dstbranch";
+    import_dsc_result $dstbranch, $newhash,
+	"dgit import-dsc: $info",
+	"results are in in git ref $dstbranch";
 }
 
 sub cmd_archive_api_query {