From: Glenn Morris <rgm@gnu.org>
Date: Wed, 17 May 2017 16:44:29 +0000 (-0400)
Subject: * admin/update_autogen (commit): Pull before push.
X-Git-Tag: emacs-26.0.90~521^2~382
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1b598d32aa06128fb5d9faa634118360e68a73c7;p=emacs.git

* admin/update_autogen (commit): Pull before push.
---

diff --git a/admin/update_autogen b/admin/update_autogen
index 898432eae60..9393ab0ee90 100755
--- a/admin/update_autogen
+++ b/admin/update_autogen
@@ -237,6 +237,8 @@ commit ()
     $vcs commit -m "; Auto-commit of $type files." "$@" || return $?
 
     [ "$vcs" = "git" ] && {
+        ## In case someone else pushed something while we were working.
+        $vcs pull --rebase || return $?
         $vcs push || return $?
     }