diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-12-20 13:56:14 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-12-20 13:56:14 -0800 |
| commit | aa1cef54a2bcc5350df7efe1d1745725c46bf2e3 (patch) | |
| tree | b8cbf49ff59b92c36de05d08f2dfd32c4aeb538b /git-parse-remote.sh | |
| parent | 1d182bd5f4ec17f2f44ac0ee0d1bf6a25e98761e (diff) | |
| parent | 4363dfbe3d2f3fe3a4bd0fa7e9b22a14532c6cdb (diff) | |
| download | git-aa1cef54a2bcc5350df7efe1d1745725c46bf2e3.tar.gz | |
Merge branch 'jc/clone'
* jc/clone:
Move "no merge candidate" warning into git-pull
Use preprocessor constants for environment variable names.
Do not create $GIT_DIR/remotes/ directory anymore.
Introduce GIT_TEMPLATE_DIR
Revert "fix testsuite: make sure they use templates freshly built from the source"
fix testsuite: make sure they use templates freshly built from the source
git-clone: lose the traditional 'no-separate-remote' layout
git-clone: lose the artificial "first" fetch refspec
git-pull: refuse default merge without branch.*.merge
git-clone: use wildcard specification for tracking branches
Diffstat (limited to 'git-parse-remote.sh')
| -rwxr-xr-x | git-parse-remote.sh | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/git-parse-remote.sh b/git-parse-remote.sh index bc881cc5f9..ea7511e8a0 100755 --- a/git-parse-remote.sh +++ b/git-parse-remote.sh @@ -132,7 +132,6 @@ canon_refs_list_for_fetch () { # or the first one otherwise; add prefix . to the rest # to prevent the secondary branches to be merged by default. merge_branches= - found_mergeref= curr_branch= if test "$1" = "-d" then @@ -142,7 +141,8 @@ canon_refs_list_for_fetch () { curr_branch=$(git-symbolic-ref HEAD | \ sed -e 's|^refs/heads/||') merge_branches=$(git-repo-config \ - --get-all "branch.${curr_branch}.merge") + --get-all "branch.${curr_branch}.merge") || + merge_branches=.this.would.never.match.any.ref. fi set x $(expand_refs_wildcard "$@") shift @@ -171,10 +171,6 @@ canon_refs_list_for_fetch () { dot_prefix= && break done fi - if test -z $dot_prefix - then - found_mergeref=true - fi case "$remote" in '') remote=HEAD ;; refs/heads/* | refs/tags/* | refs/remotes/*) ;; @@ -195,11 +191,6 @@ canon_refs_list_for_fetch () { fi echo "${dot_prefix}${force}${remote}:${local}" done - if test -z "$found_mergeref" -a "$curr_branch" - then - echo >&2 "Warning: No merge candidate found because value of config option - \"branch.${curr_branch}.merge\" does not match any remote branch fetched." - fi } # Returns list of src: (no store), or src:dst (store) |