gnucash-on-flatpak master: If code and docs use different branches, store result in code's branch subdirectory
Geert Janssens
gjanssens at code.gnucash.org
Tue Apr 21 07:21:42 EDT 2020
Updated via https://github.com/Gnucash/gnucash-on-flatpak/commit/ad1550e6 (commit)
from https://github.com/Gnucash/gnucash-on-flatpak/commit/2c8d3d1f (commit)
commit ad1550e675f8c0550460c02b85439a8465f58e69
Author: Geert Janssens <geert at kobaltwit.be>
Date: Tue Apr 21 13:21:15 2020 +0200
If code and docs use different branches, store result in code's branch subdirectory
diff --git a/functions.sh b/functions.sh
index b4f9d52..dd4c94e 100644
--- a/functions.sh
+++ b/functions.sh
@@ -130,7 +130,12 @@ function prepare_repo()
else
echo "No tag detected, assuming development build"
is_release="no"
- remote_branch_dir=$repo_rev
+ # This function is run twice - once for code once for docs
+ # Only set remote_branch_dir if not yet set (in other words code's setting takes precedence)
+ if [[ -z $remote_branch_dir ]]
+ then
+ remote_branch_dir=$repo_rev
+ fi
git reset --hard origin/$repo_rev
fi
popd
Summary of changes:
functions.sh | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
More information about the gnucash-changes
mailing list