Commit Diff

Commit:
2ed03a38b67c6087cee50723ba552a683e9a815a
From:
Stefan Sperling <stsp@stsp.name>
Via:
Thomas Adam <thomas@xteddy.org>
Date:
Message:
portable: mismerge in serve_write()
Actions:
Patch | Tree
commit - 15cd675b6d611a6290b3ed88dd47c42e5ff9eb54
commit + 2ed03a38b67c6087cee50723ba552a683e9a815a
blob - b379b3380c8819f33b831b4b307c4301b0d55d1d
blob + 6ed2c6c11517435fbb047b798fd071791c29d995
--- lib/serve.c
+++ lib/serve.c
@@ -1313,7 +1313,7 @@ serve_write(int infd, int outfd, int gotd_sock, const 
 		case GOTD_IMSG_ERROR:
 			err = gotd_imsg_recv_error(NULL, &imsg);
 			goto done;
-		case GOTD_IMSG_RECV_PACKFILE:
+		case GOTD_IMSG_PACKFILE_PIPE:
 			err = recv_packfile(&imsg, infd);
 			if (err) {
 				if (err->code != GOT_ERR_EOF)