aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-10-05 12:03:25 -0700
committerJunio C Hamano <gitster@pobox.com>2009-10-05 12:03:25 -0700
commit4973aa2286110fcedc0e8ff0da57c10509fb1a65 (patch)
tree2cf776403d28062444f189a4d593d1f70fd4c288
parenta7aebb9d00332364411e85c703cc25dc0580f2d4 (diff)
downloadgit-4973aa2286110fcedc0e8ff0da57c10509fb1a65.tar.gz
git-4973aa2286110fcedc0e8ff0da57c10509fb1a65.tar.xz
git-pull: dead code removal
Back when a74b170 (git-pull: disallow implicit merging to detached HEAD, 2007-01-15) added this check, $? referred to the error status of reading HEAD as a symbolic-ref; but cd67e4d (Teach 'git pull' about --rebase, 2007-11-28) moved the command away from where the check is, and nobody noticed the breakage. Ever since, $? has always been 0 (tr at the end of the pipe to find merge_head never fails) and other case arms were never reached. These days, error_on_no_merge_candidates function is prepared to handle a detached HEAD case, which was what the code this patch removes used to handle. Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xgit-pull.sh9
1 files changed, 1 insertions, 8 deletions
diff --git a/git-pull.sh b/git-pull.sh
index edf3ce33b..66d73eb59 100755
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -182,14 +182,7 @@ merge_head=$(sed -e '/ not-for-merge /d' \
case "$merge_head" in
'')
- case $? in
- 0) error_on_no_merge_candidates "$@";;
- 1) echo >&2 "You are not currently on a branch; you must explicitly"
- echo >&2 "specify which branch you wish to merge:"
- echo >&2 " git pull <remote> <branch>"
- exit 1;;
- *) exit $?;;
- esac
+ error_on_no_merge_candidates "$@"
;;
?*' '?*)
if test -z "$orig_head"