chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
git-debrebase: merges: Make warnings of lossage less overblown
[dgit.git]
/
dgit
diff --git
a/dgit
b/dgit
index beabccea5a93c8ee53ea8fde46ed1accf3b1d337..4cc568457a8305b83dfd83024c909d0dd19654fb 100755
(executable)
--- a/
dgit
+++ b/
dgit
@@
-5715,7
+5715,10
@@
END
if (act_local()) {
debugcmd "+",@cmd;
$!=0; $?=-1;
- failedcmd @cmd if system @cmd and $?!=7*256;
+ failedcmd @cmd
+ if system @cmd
+ and not ($? == 7*256 or
+ $? == -1 && $!==ENOENT);
} else {
dryrun_report @cmd;
}