projects
/
emacs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3267763
)
* admin/automerge (merge): Report no. of commits if too few.
author
Glenn Morris
<rgm@gnu.org>
Thu, 22 Feb 2018 02:00:23 +0000
(21:00 -0500)
committer
Glenn Morris
<rgm@gnu.org>
Thu, 22 Feb 2018 02:00:23 +0000
(21:00 -0500)
admin/automerge
patch
|
blob
|
history
diff --git
a/admin/automerge
b/admin/automerge
index 76c1596f3fa00ce1f5a3d795278566159ade6e3d..ba608d10904befaefb73c2e2bb6e7a2cf51b8296 100755
(executable)
--- a/
admin/automerge
+++ b/
admin/automerge
@@
-161,10
+161,8
@@
merge ()
return 0
else
- grep -qE "Nothing to merge|Number of missing commits" $tempfile && {
- echo "Fewer than $nmin commits to merge"
+ grep -E "Nothing to merge|Number of missing commits" $tempfile && \
exit 0
- }
cat "$tempfile" 1>&2