mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2025-02-04 20:27:45 +00:00
* admin/automerge (merge): Report no. of commits if too few.
This commit is contained in:
parent
3267763e6b
commit
041c8c4c5d
@ -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
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user