diff options
| author |  Jonathan Tan <jonathantanmy@google.com> | 2018-05-01 17:31:29 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-05-02 18:54:32 +0900 |
| commit | 7cc6ed2d06d6631726af9c14b5258d723c513327 (patch) | |
| tree | dc185e5d974f897459342e573e51b3f9a71ece8c | |
| parent | Merge branch 'bw/protocol-v2' into jt/partial-clone-proto-v2 (diff) | |
| download | tgif-7cc6ed2d06d6631726af9c14b5258d723c513327.tar.xz | |
upload-pack: fix error message typo
Fix a typo in an error message.
Also, this line was introduced in 3145ea957d2c ("upload-pack: introduce
fetch server command", 2018-03-15), which did not contain a test for the
case which causes this error to be printed, so introduce a test.
Signed-off-by: Jonathan Tan <jonathantanmy@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | t/t5701-git-serve.sh | 14 | ||||
| -rw-r--r-- | upload-pack.c | 2 |
2 files changed, 15 insertions, 1 deletions
diff --git a/t/t5701-git-serve.sh b/t/t5701-git-serve.sh index 72d7bc5628..1b4b13cc2b 100755 --- a/t/t5701-git-serve.sh +++ b/t/t5701-git-serve.sh @@ -173,4 +173,18 @@ test_expect_success 'symrefs parameter' ' test_cmp actual expect ' +test_expect_success 'unexpected lines are not allowed in fetch request' ' + git init server && + + test-pkt-line pack >in <<-EOF && + command=fetch + 0001 + this-is-not-a-command + 0000 + EOF + + test_must_fail git -C server serve --stateless-rpc <in >/dev/null 2>err && + grep "unexpected line: .this-is-not-a-command." err +' + test_done diff --git a/upload-pack.c b/upload-pack.c index 87b4d32a6e..c4456bb88a 100644 --- a/upload-pack.c +++ b/upload-pack.c @@ -1252,7 +1252,7 @@ static void process_args(struct packet_reader *request, } /* ignore unknown lines maybe? */ - die("unexpect line: '%s'", arg); + die("unexpected line: '%s'", arg); } } |