From 9218000d5e295c125a552fa41c5f139b149f4726 Mon Sep 17 00:00:00 2001 From: Daniel Albers Date: Sun, 27 Oct 2013 01:28:58 +0200 Subject: [PATCH] tx-sync.sh: try to pull first --- scripts/tx-sync.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/tx-sync.sh b/scripts/tx-sync.sh index c60d6af0..47b931cc 100755 --- a/scripts/tx-sync.sh +++ b/scripts/tx-sync.sh @@ -5,6 +5,7 @@ localpobranch=i18n-tx-sync pushd "$quasselsrc" && ( currb=$(git name-rev --name-only HEAD) git checkout -q $localpobranch && ( + git pull -q EDITOR=/bin/true VISUAL=/usr/bin/editor "$quasselsrc"/po/pull-from-transifex.sh -f && git push -q ); git checkout -q "$currb" -- 2.20.1