summaryrefslogtreecommitdiff
path: root/git-parse-remote.sh
diff options
context:
space:
mode:
authorJosef Weidendorfer <Josef.Weidendorfer@gmx.de>2006-12-19 01:39:07 +0100
committerJunio C Hamano <junkio@cox.net>2006-12-19 01:53:02 -0800
commit4363dfbe3d2f3fe3a4bd0fa7e9b22a14532c6cdb (patch)
tree9828125cc72c6fe06210c519bb2449c60d1d40f6 /git-parse-remote.sh
parentd4ebc36c5ee964592303c59260417b758d024c31 (diff)
downloadgit-4363dfbe3d2f3fe3a4bd0fa7e9b22a14532c6cdb.tar.gz
Move "no merge candidate" warning into git-pull
The warning triggered even when running "git fetch" only when resulting .git/FETCH_HEAD only contained branches marked as 'not-for-merge'. Signed-off-by: Josef Weidendorfer <weidendo@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-parse-remote.sh')
-rwxr-xr-xgit-parse-remote.sh10
1 files changed, 0 insertions, 10 deletions
diff --git a/git-parse-remote.sh b/git-parse-remote.sh
index 11c4aba244..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
@@ -172,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/*) ;;
@@ -196,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)