[pitivi] pitivi-git-environment: Ensure a pull --rebase works for glib and gstreamer

[Jean-FranÃois Fortin Tam <jfft src gnome org>]

commit 3bf645ddd24a4b13533f42052efabd81eee6bcac
Author: Jean-FranÃois Fortin Tam <nekohayo gmail com>
Date:   Sun Sep 30 12:52:59 2012 -0400

    pitivi-git-environment: Ensure a pull --rebase works for glib and gstreamer
    
    During compilation, those two would touch some files that are controlled by Git

 bin/pitivi-git-environment.sh |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)
---
diff --git a/bin/pitivi-git-environment.sh b/bin/pitivi-git-environment.sh
index 0988330..2d6ec3d 100755
--- a/bin/pitivi-git-environment.sh
+++ b/bin/pitivi-git-environment.sh
@@ -206,6 +206,11 @@ if [ "$ready_to_run" != "1" ]; then
             fi
         fi
         cd $m
+        # Silly hack for the fact that glib changes the "mkinstalldirs" file
+        # when compiling, which prevents git pull --rebase from working
+        if [ $m == "glib" ]; then
+            git checkout -- mkinstalldirs
+        fi
         git pull --rebase
         if [ $? -ne 0 ]; then
             exit 1
@@ -259,6 +264,12 @@ if [ "$ready_to_run" != "1" ]; then
             echo "Could not run checkout $GST_RELEASE_TAG for $m ; result: $?"
             exit 1
         fi
+        # Silly hack for the fact that the version-controlled po/ files are
+        # changed during compilation of the "gstreamer" module, which prevents
+        # git pull --rebase from working
+        if [ $m == "gstreamer" ]; then
+            git checkout -- po
+        fi
         git pull --rebase
         if [ $? -ne 0 ]; then
             exit 1