[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 041c8c4: * admin/automerge (merge): Report no. of c
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] master 041c8c4: * admin/automerge (merge): Report no. of commits if too few. |
Date: |
Wed, 21 Feb 2018 21:00:30 -0500 (EST) |
branch: master
commit 041c8c4c5d451a6bc6db73419fd5ffca3d09231f
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>
* admin/automerge (merge): Report no. of commits if too few.
---
admin/automerge | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/admin/automerge b/admin/automerge
index 76c1596..ba608d1 100755
--- 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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master 041c8c4: * admin/automerge (merge): Report no. of commits if too few.,
Glenn Morris <=