From b883a9f2b752fcedfdf9268fa79eca8d99c35be4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Seva?= Date: Tue, 22 Sep 2015 11:05:05 +0200 Subject: [PATCH] Revert "MT#15293 commit: [PRO] do pull first" This reverts commit 76ada0a7725f185574a5035bbcaa857756c21c7b. Change-Id: Ibd01e0abfe24dcd3b6f681e66fa696cd7ca6852d --- scripts/commit | 9 --------- 1 file changed, 9 deletions(-) diff --git a/scripts/commit b/scripts/commit index a7d2b6c2..6eb3dda6 100755 --- a/scripts/commit +++ b/scripts/commit @@ -64,15 +64,6 @@ 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 "${SCRIPTS}"/pull ] ; then - log_debug 'git stash' - git stash >/dev/null - if ! "${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