diff options
| author | Andreas Schwab <aschwab@redhat.com> | 2009-06-18 15:49:56 +0200 |
|---|---|---|
| committer | Andreas Schwab <aschwab@redhat.com> | 2009-06-18 15:49:56 +0200 |
| commit | 5f9df8e7b478cafd4528a133201f4611a963292e (patch) | |
| tree | 332931e9decd30c7a318c1fd3b8dd4bed629fcac | |
| parent | ce6a278482f79dc52d0305e45de144d5e598568a (diff) | |
Don't automatically merge from followed branch on git pull.
Use branch.$(my-branch).follow instead of branch.$(my-branch).merge to
record branch to follow and explicitly merge on make merge.
| -rw-r--r-- | fedora/Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fedora/Makefile b/fedora/Makefile index 95b67f9d83..71012e2d4c 100644 --- a/fedora/Makefile +++ b/fedora/Makefile @@ -15,7 +15,7 @@ branchname = $(patsubst refs/heads/%,%,$1) my-branch := $(call branchname,$(call git,symbolic-ref,HEAD)) upstream-remote := $(call gitconf,branch.$(my-branch).remote) -upstream-branch := $(call branchname,$(call gitconf,branch.$(my-branch).merge)) +upstream-branch := $(call branchname,$(call gitconf,branch.$(my-branch).follow)) dep-my-branch := $(firstword $(wildcard ../.git/refs/heads/$(my-branch) \ ../.git/packed-refs)) @@ -30,7 +30,7 @@ ifeq (,$(branch)) @echo "Use '$(MAKE) follow branch=NAME'"; exit 2 else $(GIT) rev-parse --verify $(upstream-remote)/$(branch) - $(GIT) config branch.$(my-branch).merge $(branch) + $(GIT) config branch.$(my-branch).follow $(branch) @$(GIT) branch -v | grep "^. $(subst .,\\.,$(my-branch)) " endif @@ -39,6 +39,7 @@ endif # Then you follow up with editting, 'git add FILE...', and git commit. merge: $(GIT) pull + $(GIT) merge $(upstream-remote)/$(upstream-branch) describe-merge = describe --match 'glibc-*' |