Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master sorcery by Ismael Luceno (820fc3f405055ea41e5e682d5f22a2629a4f8830)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master sorcery by Ismael Luceno (820fc3f405055ea41e5e682d5f22a2629a4f8830)
  • Date: Mon, 8 Apr 2013 15:25:30 -0500

GIT changes to master sorcery by Ismael Luceno <ismael AT sourcemage.org>:

ChangeLog | 3 +
var/lib/sorcery/modules/dl_handlers/dl_git | 53
++++++++---------------------
2 files changed, 19 insertions(+), 37 deletions(-)

New commits:
commit 820fc3f405055ea41e5e682d5f22a2629a4f8830
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

dl_git: Simplified handling

Fixes checkout of tags.

diff --git a/ChangeLog b/ChangeLog
index a22b440..db3fb14 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2013-03-16 Ismael Luceno <ismael AT sourcemage.org>
+ * dl_git: Simpified handling, fixes checkout of tags
+
2012-08-25 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* sorcery: only look at spec files when scanning architectures #438

diff --git a/var/lib/sorcery/modules/dl_handlers/dl_git
b/var/lib/sorcery/modules/dl_handlers/dl_git
index 95546b5..b57f553 100755
--- a/var/lib/sorcery/modules/dl_handlers/dl_git
+++ b/var/lib/sorcery/modules/dl_handlers/dl_git
@@ -36,44 +36,23 @@ function dl_git_get () {
for url in $url_list; do
local URL GIT_ROOT GIT_DIRECTORY GIT_TAG
url_crack "$url" "$hints"
- if [[ -z $GIT_DIRECTORY ]]
- then
- GIT_DIRECTORY=${target/.git/}
- fi
- if test -d $GIT_DIRECTORY; then
- message "${MESSAGE_COLOR}Running git pull...${DEFAULT_COLOR}"
- ( cd $GIT_DIRECTORY &&
- match=$(git branch | grep -F " $GIT_TAG"; true) &&
- if [[ $match ]]; then
- # no need to checkout a branch if we're already on it
- if [[ ${match:0:1} != '*' ]]; then
- echo git checkout $GIT_TAG &&
- git checkout $GIT_TAG
- else
- : # already on the correct branch
- fi
- else
- echo git checkout -b $GIT_TAG origin/$GIT_TAG &&
- git checkout -b $GIT_TAG origin/$GIT_TAG
- fi
- echo git pull &&
- git pull )
- rc=$?
- eval "$dl_target=\"$GIT_DIRECTORY\""
- else
- message "${MESSAGE_COLOR}Running git clone...${DEFAULT_COLOR}"
- echo git clone $GIT_ROOT $GIT_DIRECTORY
- git clone $GIT_ROOT $GIT_DIRECTORY &&
- cd $GIT_DIRECTORY &&
- if ! git branch | grep -qF " $GIT_TAG"; then
- echo git checkout -b $GIT_TAG origin/$GIT_TAG &&
- git checkout -b $GIT_TAG origin/$GIT_TAG
- fi
- rc=$?
- cd ../
- eval "$dl_target=\"$GIT_DIRECTORY\""
+ [[ -z $GIT_DIRECTORY ]] && GIT_DIRECTORY=${target%.git}
+ [[ -z $GIT_TAG ]] && GIT_TAG=master
+
+ if ! test -d $GIT_DIRECTORY; then
+ message "${MESSAGE_COLOR}Initializing...${DEFAULT_COLOR}"
+ git init "$GIT_DIRECTORY"
fi
- [[ $rc == 0 ]] && break
+
+ message "${MESSAGE_COLOR}Fetching...${DEFAULT_COLOR}"
+ GIT_DIR="$GIT_DIRECTORY/.git" git fetch "$GIT_ROOT" "$GIT_TAG" ||
continue
+
+ cd "$GIT_DIRECTORY" &&
+ git reset --hard FETCH_HEAD; rc=$?
+ cd ..
+
+ eval "$dl_target=\"$GIT_DIRECTORY\""
+ break
done
dl_disconnect




  • [SM-Commit] GIT changes to master sorcery by Ismael Luceno (820fc3f405055ea41e5e682d5f22a2629a4f8830), Ismael Luceno, 04/08/2013

Archive powered by MHonArc 2.6.24.

Top of Page