From de4f6ef4c9b7c2ad85af8e40aeb41ac955f6a510 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antonin=20D=C3=A9cimo?= <antonin.decimo@gmail.com>
Date: Mon, 21 Jul 2014 01:19:21 +0200
Subject: [PATCH] Better git integration.

---
 love-release.sh | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/love-release.sh b/love-release.sh
index dec6183..acd5a84 100755
--- a/love-release.sh
+++ b/love-release.sh
@@ -755,11 +755,23 @@ if [ "$RELEASE_APK" = true ]; then
   LOVE_ANDROID_DIR="$CACHE_DIR"/love-android-sdl2
   if [ -d "$LOVE_ANDROID_DIR" ]; then
     cd "$LOVE_ANDROID_DIR"
-    git checkout
-    git pull
+    git checkout -- .
+    LOCAL=$(git rev-parse @)
+    REMOTE=$(git rev-parse @{u})
+    BASE=$(git merge-base @ @{u})
+    if [ $LOCAL = $REMOTE ]; then
+      :
+    elif [ $LOCAL = $BASE ]; then
+      git pull
+      ndk-build --jobs $(( $(nproc) + 1))
+    fi
     cd "$RELEASE_DIR"
   else
-    git clone https://bitbucket.org/MartinFelis/love-android-sdl2.git "$CACHE_DIR"/love-android-sdl2
+    cd "$CACHE_DIR"
+    git clone https://bitbucket.org/MartinFelis/love-android-sdl2.git
+    cd "$LOVE_ANDROID_DIR"
+    ndk-build --jobs $(( $(nproc) + 1))
+    cd "$RELEASE_DIR"
   fi
 
   mkdir -p "$LOVE_ANDROID_DIR"/assets