projects
/
m6w6
/
btr
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
flush
[m6w6/btr]
/
lib
/
btr
/
source
/
git.mk
diff --git
a/lib/btr/source/git.mk
b/lib/btr/source/git.mk
index cfad07fab5ff42f8809d9051660ff6bba7003b05..3808590450e2cc09deece2fd99a6aa861e357d98 100644
(file)
--- a/
lib/btr/source/git.mk
+++ b/
lib/btr/source/git.mk
@@
-1,18
+1,31
@@
-.PHONY: pull all
+SOURCE_CLEAN=false
+
+.PHONY: fetch all clean
.SUFFIXES:
.SUFFIXES:
-all: $(BRANCH_DIR) pull
+all: $(BRANCH_DIR) clean fetch
+ $(SAY) "Merging $(BRANCH) of $(REPO)..."
cd $(BRANCH_DIR) && \
cd $(BRANCH_DIR) && \
- git pull -q
+ git merge $(QUIET_FLAG) --ff-only;
+
+clean: $(BRANCH_DIR)
+ if $(SOURCE_CLEAN); \
+ then \
+ cd $(BRANCH_DIR) && \
+ git reset --hard $(QUIET_FLAGS); \
+ fi;
-pull: $(CLEAN_DIR)
+fetch: $(CLEAN_DIR)
+ $(SAY) "Fetching $(REPO)..."
cd $(CLEAN_DIR) && \
cd $(CLEAN_DIR) && \
- git pull -q
+ git fetch $(QUIET_FLAG);
$(CLEAN_DIR):
$(CLEAN_DIR):
- git clone $(SOURCE_URL) $(CLEAN_DIR)
+ $(SAY) "Cloning from $(SOURCE_ARGS)..."
+ git clone $(QUIET_FLAG) $(SOURCE_ARGS) $(CLEAN_DIR);
$(BRANCH_DIR): $(CLEAN_DIR)
$(BRANCH_DIR): $(CLEAN_DIR)
+ $(SAY) "Creating workdir for $(BRANCH)"
git-new-workdir $(CLEAN_DIR) $(BRANCH_DIR) $(BRANCH)
# vim: noet
git-new-workdir $(CLEAN_DIR) $(BRANCH_DIR) $(BRANCH)
# vim: noet