| commit | 4973aa2286110fcedc0e8ff0da57c10509fb1a65 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 5 Oct 2009 19:03:25 +0000 (5 12:03 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 5 Oct 2009 19:03:25 +0000 (5 12:03 -0700) | ||
| tree | 2cf776403d28062444f189a4d593d1f70fd4c288 | treesnapshot (tar.gz zip) |
| parent | a7aebb9d00332364411e85c703cc25dc0580f2d4 | commitdiff |
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>
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>
| git-pull.sh | diffblobblamehistory |