summaryrefslogtreecommitdiff
path: root/README
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-10-05 19:03:25 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-10-05 19:03:25 (GMT)
commit4973aa2286110fcedc0e8ff0da57c10509fb1a65 (patch)
tree2cf776403d28062444f189a4d593d1f70fd4c288 /README
parenta7aebb9d00332364411e85c703cc25dc0580f2d4 (diff)
downloadgit-4973aa2286110fcedc0e8ff0da57c10509fb1a65.zip
git-4973aa2286110fcedc0e8ff0da57c10509fb1a65.tar.gz
git-4973aa2286110fcedc0e8ff0da57c10509fb1a65.tar.bz2
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>
Diffstat (limited to 'README')
0 files changed, 0 insertions, 0 deletions