X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit;h=0df3f7534a1872b3a11615232679a110ca347b6a;hp=fabf83bb8d96002f11c31f79f86918f592750f92;hb=8ac258a499a5d034684d47c6144be82b87535c24;hpb=31b14133b081055c15b0f70edb9d75a85615010d

diff --git a/dgit b/dgit
index fabf83bb..0df3f753 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 () {
@@ -2763,8 +2764,8 @@ sub git_fetch_us () {
 	} elsif ($here{$lref} eq $objid) {
 	    lrfetchref_used $fullrefname;
 	} else {
-	    print STDERR \
-		"Not updateting $lref from $here{$lref} to $objid.\n";
+	    print STDERR
+		"Not updating $lref from $here{$lref} to $objid.\n";
 	}
     });
 }
@@ -2799,6 +2800,11 @@ sub fetch_from_archive_record_2 ($) {
     }
 }
 
+sub parse_dsc_field_def_dsc_distro () {
+    $dsc_distro //= cfg qw(dgit.default.old-dsc-distro
+			   dgit.default.distro);
+}
+
 sub parse_dsc_field ($$) {
     my ($dsc, $what) = @_;
     my $f;
@@ -2806,16 +2812,17 @@ sub parse_dsc_field ($$) {
 	$f = $dsc->{$field};
 	last if defined $f;
     }
+
     if (!defined $f) {
 	progress "$what: NO git hash";
+	parse_dsc_field_def_dsc_distro();
     } elsif (($dsc_hash, $dsc_distro, $dsc_hint_tag, $dsc_hint_url)
 	     = $f =~ m/^(\w+)\s+($distro_re)\s+($versiontag_re)\s+(\S+)(?:\s|$)/) {
 	progress "$what: specified git info ($dsc_distro)";
 	$dsc_hint_tag = [ $dsc_hint_tag ];
     } elsif ($f =~ m/^\w+\s*$/) {
 	$dsc_hash = $&;
-	$dsc_distro //= cfg qw(dgit.default.old-dsc-distro
-			       dgit.default.distro);
+	parse_dsc_field_def_dsc_distro();
 	$dsc_hint_tag = [ debiantags +(getfield $dsc, 'Version'),
 			  $dsc_distro ];
 	progress "$what: specified git hash";
@@ -2911,7 +2918,7 @@ but we could not obtain that object anywhere.
 END
 	foreach my $t (@tags) {
 	    my $fullrefname = $lrf.'/'.$t;
-	    print STDERR "CHK $t $fullrefname ".Dumper(\%lrfetchrefs_f);
+#	    print STDERR "CHK $t $fullrefname ".Dumper(\%lrfetchrefs_f);
 	    next unless $lrfetchrefs_f{$fullrefname};
 	    next unless is_fast_fwd "$fullrefname~0", $dsc_hash;
 	    lrfetchref_used $fullrefname;
@@ -3310,6 +3317,53 @@ 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();
@@ -6044,6 +6098,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;
 
@@ -6111,6 +6172,12 @@ sub cmd_import_dsc {
 
     parse_dsc_field($dsc, "Dgit metadata in .dsc")
 	unless forceing [qw(import-dsc-with-dgit-field)];
+    parse_dsc_field_def_dsc_distro();
+
+    $isuite = 'DGIT-IMPORT-DSC';
+    $idistro //= $dsc_distro;
+
+    notpushing();
 
     if (defined $dsc_hash) {
 	progress "dgit: import-dsc of .dsc with Dgit field, using git hash";
@@ -6134,10 +6201,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;
     }
 
@@ -6148,8 +6214,6 @@ Specify  +$specbranch to overwrite, discarding existing history
 END
 	if $oldhash && !$force;
 
-    notpushing();
-
     my @dfi = dsc_files_info();
     foreach my $fi (@dfi) {
 	my $f = $fi->{Filename};
@@ -6199,10 +6263,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 {