diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-07-19 11:21:08 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-07-19 11:21:08 -0700 |
| commit | c5212b87dafb3f559ceb898bd9b40bfc3cd0ad68 (patch) | |
| tree | ef8e9686d647a7e47a6c999cfbca6d0e14bcb1c4 /server-info.c | |
| parent | f0e5a4b7f3db2d4e1ded9683817d1d1d3a2a220f (diff) | |
| parent | c173dad58787a7f11a526dbcdaa5a2fe9ff1c87f (diff) | |
| download | git-c5212b87dafb3f559ceb898bd9b40bfc3cd0ad68.tar.gz git-c5212b87dafb3f559ceb898bd9b40bfc3cd0ad68.tar.xz | |
Merge branch 'maint'
* maint:
update-server-info: Shorten read_pack_info_file()
Documentation: Explain git-mergetool's use of temporary files
Diffstat (limited to 'server-info.c')
| -rw-r--r-- | server-info.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/server-info.c b/server-info.c index 4098ca2b5..9ec744e9f 100644 --- a/server-info.c +++ b/server-info.c @@ -113,11 +113,8 @@ static int read_pack_info_file(const char *infofile) goto out_stale; break; case 'D': /* we used to emit D but that was misguided. */ - goto out_stale; - break; case 'T': /* we used to emit T but nobody uses it. */ goto out_stale; - break; default: error("unrecognized: %s", line); break; |