diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2008-08-04 04:25:21 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2008-08-04 04:25:21 +0200 |
| commit | 5daea1607d15a4cc952ec36204a895836bb2d73f (patch) | |
| tree | d3cafc7656d4841a454f5cd1bd19a13e87f642cf | |
| parent | b373cc289c777a10b1411441f2c999b2f9fbc9d0 (diff) | |
| parent | 5687e0cc45858e2215a9f110d3d6d21b98b6ffd4 (diff) | |
Merge branch 'master' into scs
| -rw-r--r-- | make/git.mk | 4 | ||||
| -rw-r--r-- | make/rules.mk | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/make/git.mk b/make/git.mk index 0059448..072617e 100644 --- a/make/git.mk +++ b/make/git.mk @@ -13,8 +13,8 @@ noncurrentbranches = $(filter-out $(currentbranch),$(branches)) update: git fetch $(origin) $(if $(filter $(currentbranch),$(master)),,git branch -f "$(master)" "$(origin)/$(master)" && git checkout "$(master)") - git merge --no-commit "$(origin)" - $(if $(noncurrentbranches),$(foreach branch,$(noncurrentbranches),git branch -f "$(branch)" "$(origin)/$(branch)" && git checkout "$(branch)" && git merge --no-commit "$(origin)" &&) git checkout "$(master)") + git pull "$(origin)" + $(if $(noncurrentbranches),$(foreach branch,$(noncurrentbranches),git branch -f "$(branch)" "$(origin)/$(branch)" && git checkout "$(branch)" && git pull "$(origin)" &&) git checkout "$(master)") init: git init diff --git a/make/rules.mk b/make/rules.mk index 9961061..5369cd0 100644 --- a/make/rules.mk +++ b/make/rules.mk @@ -29,7 +29,7 @@ $(1): master = $$(subst -LOCALE,$(2:%=-$(2)),$$($(4)_BRANCH)) $(1): branches = $$(if $(2),,$$(filter-out $$(master),$$($(3)_BRANCHES))) $(1): @[ -d "$$(dir $$@)" ] || ( echo mkdir -p "$$(dir $$@)" && mkdir -p "$$(dir $$@)" ) - @[ -d "$$@" ] || ( echo git clone "$$(origin)" "$$@" && git clone -o "$(4)" "$$(origin)" "$$@" ) + @[ -d "$$@" ] || ( echo git clone -o "$(4)" "$$(origin)" "$$@" && git clone -o "$(4)" "$$(origin)" "$$@" ) @$(MAKE) -f "$$(CURDIR)/make/git.mk" -C "$$@" master="$$(master)" branches="$$(branches)" origin="$(4)" update # WARNING: this may wipe unrelated files too! |