[PATCH util-modular 08/10] release.sh: check for local changes while in the git root directory

Emil Velikov emil.l.velikov at gmail.com
Fri Jul 1 14:44:49 UTC 2016


Current approach relies that the builddir will be nested within the git
root directory. Thus checking the git "build" directory works for now.

With next commits we'll untangle this - making true out-of-tree
builds/releasing possible.

Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
---
 release.sh | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/release.sh b/release.sh
index 6a72302..e374b02 100755
--- a/release.sh
+++ b/release.sh
@@ -313,6 +313,13 @@ process_module() {
 	return 1
     fi
 
+    # Check for uncommitted/queued changes.
+    check_local_changes
+    if [ $? -ne 0 ]; then
+	return 1
+    fi
+
+
     # Change directory to be in the git build directory (could be out-of-source)
     # More than one can be found when distcheck has run and failed
     configNum=`find . -name config.status -type f | wc -l | sed 's:^ *::'`
@@ -346,15 +353,6 @@ process_module() {
 	return 1
     fi
 
-    # ----- Now in the git module *build* directory ----- #
-
-    # Check for uncommitted/queued changes.
-    check_local_changes
-    if [ $? -ne 0 ]; then
-	cd $top_src
-	return 1
-    fi
-
     # Determine what is the current branch and the remote name
     current_branch=`git branch | $GREP "\*" | sed -e "s/\* //"`
     remote_name=`git config --get branch.$current_branch.remote`
-- 
2.8.2



More information about the xorg-devel mailing list