chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Dgit.pm: $negate_harmful_gitattrs: Break out from dgit
[dgit.git]
/
dgit
diff --git
a/dgit
b/dgit
index 1f1563075bbc065d80fea603c5e5e2bb05d41631..3cf7705dd052d8b6a1bb15737486bf9911ed686c 100755
(executable)
--- a/
dgit
+++ b/
dgit
@@
-493,12
+493,6
@@
sub url_get {
our ($dscdata,$dscurl,$dsc,$dsc_checked,$skew_warning_vsn);
our ($dscdata,$dscurl,$dsc,$dsc_checked,$skew_warning_vsn);
-sub runcmd {
- debugcmd "+",@_;
- $!=0; $?=-1;
- failedcmd @_ if system @_;
-}
-
sub act_local () { return $dryrun_level <= 1; }
sub act_scary () { return !$dryrun_level; }
sub act_local () { return $dryrun_level <= 1; }
sub act_scary () { return !$dryrun_level; }
@@
-3384,7
+3378,7
@@
END
open GAO, "> $af.new" or die $!;
print GAO <<END or die $!;
* dgit-defuse-attrs
open GAO, "> $af.new" or die $!;
print GAO <<END or die $!;
* dgit-defuse-attrs
-[attr]dgit-defuse-attrs
-text -eol -crlf -ident -filter
+[attr]dgit-defuse-attrs
$negate_harmful_gitattrs
# ^ see GITATTRIBUTES in dgit(7) and dgit setup-new-tree in dgit(1)
END
my $gai = open_gitattrs();
# ^ see GITATTRIBUTES in dgit(7) and dgit setup-new-tree in dgit(1)
END
my $gai = open_gitattrs();
@@
-3913,6
+3907,7
@@
sub splitbrain_pseudomerge ($$$$) {
#
return $dgitview unless defined $archive_hash;
#
return $dgitview unless defined $archive_hash;
+ return $dgitview if deliberately_not_fast_forward();
printdebug "splitbrain_pseudomerge...\n";
printdebug "splitbrain_pseudomerge...\n";
@@
-4920,14
+4915,13
@@
sub quiltify_trees_differ ($$;$$$) {
die "modified symlink\n" unless $newmode =~ m/^10/;
} elsif ($oldmode =~ m/[^0]/) {
# deletion
die "modified symlink\n" unless $newmode =~ m/^10/;
} elsif ($oldmode =~ m/[^0]/) {
# deletion
- die "non-default mode or type\n"
- unless $newmode =~ m/^100644$/ ||
- $oldmode =~ m/^100644$/;
+ die "deletion of symlink\n"
+ unless $oldmode =~ m/^10/;
} else {
# creation
} else {
# creation
- die "
non-default mode or typ
e\n"
- unless $newmode =~ m/^100644$/
||
- $
oldmode =~ m/^100644
$/;
+ die "
creation with non-default mod
e\n"
+ unless $newmode =~ m/^100644$/
or
+ $
newmode =~ m/^120000
$/;
}
};
if ($@) {
}
};
if ($@) {