chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
test suite: sbuild-gitish: Find sbuild rune in the manpage
[dgit.git]
/
dgit
diff --git
a/dgit
b/dgit
index d1bf2136a6d86550f847e5d071322a3227885864..9c7ec734e9f52c4371a31e817a3a392981c0f399 100755
(executable)
--- a/
dgit
+++ b/
dgit
@@
-3913,6
+3913,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";
@@
-4924,9
+4925,9
@@
sub quiltify_trees_differ ($$;$$$) {
unless $oldmode =~ m/^10/;
} else {
# creation
unless $oldmode =~ m/^10/;
} 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 ($@) {