diff options
author | Jon TURNEY <jon.turney@dronecode.org.uk> | 2015-03-05 14:15:08 +0000 |
---|---|---|
committer | Jon TURNEY <jon.turney@dronecode.org.uk> | 2015-03-05 14:15:08 +0000 |
commit | 7972c0fb5cf4fa0c77d3d8fd2e3a1f9ac3bdd39e (patch) | |
tree | 61a365f667ca5debabae7eebd608e47cc3e86c1c | |
parent | 89d8af6531ab60c3ada412889bef6b00e3aa76b1 (diff) |
Fix jhbuild_patches_collect to ignore non-git modules
-rwxr-xr-x | jhbuild_patches_collect | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/jhbuild_patches_collect b/jhbuild_patches_collect index fd22c20..f24a6c4 100755 --- a/jhbuild_patches_collect +++ b/jhbuild_patches_collect @@ -14,13 +14,15 @@ for i in $LIST ; do D=${D%% *} # echo "$i: $D" if [ "$D" != "$M" ] ; then - cd $D - git diff --quiet --ignore-submodules || (echo "$i: dirty" && exit 1 ) || exit 1 - FN=`git format-patch -o $O origin/master` - cd - >/dev/null - for p in $FN; do - echo $p - mv $p $O/$i-`basename $p` - done + cd $D + if [ -e ".git" ]; then + git diff --quiet --ignore-submodules || (echo "$i: dirty" && exit 1 ) || exit 1 + FN=`git format-patch -o $O origin/master` + cd - >/dev/null + for p in $FN; do + echo $p + mv $p $O/$i-`basename $p` + done + fi fi done |