tx-sync.sh: try to pull first
authorDaniel Albers <daniel@lbe.rs>
Sat, 26 Oct 2013 23:28:58 +0000 (01:28 +0200)
committerDaniel Albers <daniel@lbe.rs>
Mon, 25 Nov 2013 00:07:46 +0000 (01:07 +0100)
scripts/tx-sync.sh

index c60d6af..47b931c 100755 (executable)
@@ -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"