MT#15293 commit: [PRO] do pull first

Change-Id: I09bd0078f77ef000ff96f3dba38e05d07c698531
11 years ago · 76ada0a772
parent b9d07def25
commit 76ada0a772
1 changed files with 9 additions and 0 deletions
--- a/scripts/commit
+++ b/scripts/commit
@ -59,6 +59,15 @@ log_debug "git status | grep -q 'working directory clean'"
 if git status | grep -q 'working directory clean' ; then
   log_info "OK:   nothing to commit."
 else
+  if [ -f /usr/share/ngcp-ngcpcfg/scripts/pull ] ; then
+    log_debug 'git stash'
+    git stash >/dev/null
+    if ! /usr/share/ngcp-ngcpcfg/scripts/pull ; then
+      exit 1
+    fi
+    log_debug 'git stash pop'
+    git stash pop >/dev/null
+  fi
  log_debug 'git add . ; git commit -a -m "$msg [$(date --rfc-3339=ns)]"'
  git add .
  git commit -a -m "$msg [$(date --rfc-3339=ns)]" >/dev/null