{"thread":{"id":"32718","subject":"[PATCH] Update renamed file merge-file.h in Makefile","startedAt":"2013-01-25T03:06:28Z","lastAt":"2013-01-25T04:59:42Z","messageCount":2,"participants":["Jiang Xin"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"207744","messageId":"1359083188-31866-1-git-send-email-worldhello.net@gmail.com","threadId":"32718","inReplyTo":null,"subject":"[PATCH] Update renamed file merge-file.h in Makefile","fromName":"Jiang Xin","fromEmail":"worldhello.net@gmail.com","sentAt":"2013-01-25T03:06:28Z","receivedAt":"2013-01-25T03:06:28Z","isPatch":true,"sender":{"key":"worldhello.net@gmail.com","avatar":"https://avatars.githubusercontent.com/u/183860?v=4"},"body":"Commit v1.8.1-rc0-3-gfa2364e renamed merge-file.h to merge-blobs.h, but\nforgot to update the reference of merge-file.h in Makefile. This would\nbreak the build of \"po/git.pot\", which depends on $(LOCALIZED_C), then\nfallback to the missing file \"merge-file.h\".\n\nSigned-off-by: Jiang Xin <worldhello.net@gmail.com>\n---\n Makefile |    2 +-\n 1 个文件被修改，插入 1 行(+)，删除 1 行(-)\n\ndiff --git a/Makefile b/Makefile\nindex 1b30d7b..a786d4c 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -649,7 +649,7 @@ LIB_H += list-objects.h\n LIB_H += ll-merge.h\n LIB_H += log-tree.h\n LIB_H += mailmap.h\n-LIB_H += merge-file.h\n+LIB_H += merge-blobs.h\n LIB_H += merge-recursive.h\n LIB_H += mergesort.h\n LIB_H += notes-cache.h\n-- \n1.8.1.1\n"},{"id":"207758","messageId":"CANYiYbHWE+88DbSoA2EgcZjCh+9YTcHGQhumSUkx_ovXY6FSDQ@mail.gmail.com","threadId":"32718","inReplyTo":"1359083188-31866-1-git-send-email-worldhello.net@gmail.com","subject":"Re: [PATCH] Update renamed file merge-file.h in Makefile","fromName":"Jiang Xin","fromEmail":"worldhello.net@gmail.com","sentAt":"2013-01-25T04:59:42Z","receivedAt":"2013-01-25T04:59:42Z","isPatch":true,"sender":{"key":"worldhello.net@gmail.com","avatar":"https://avatars.githubusercontent.com/u/183860?v=4"},"body":"Oops,  I find it is already fixed in commit\na60521bc6099ce89d05ef2160d2e3c30a106fda7.\n\ncommit a60521bc6099ce89d05ef2160d2e3c30a106fda7\nAuthor: Ramsay Jones <ramsay@ramsay1.demon.co.uk>\nDate:   Tue Jan 22 16:47:47 2013 +0000\n\n    Makefile: Replace merge-file.h with merge-blobs.h in LIB_H\n\n    Commit fa2364ec (\"Which merge_file() function do you mean?\", 06-12-2012)\n    renamed the files merge-file.[ch] to merge-blobs.[ch], but forgot to\n    rename the header file in the definition of the LIB_H macro.\n\n    Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>\n    Signed-off-by: Junio C Hamano <gitster@pobox.com>\n\n(kick back to the list)\n\n2013/1/25 Jiang Xin <worldhello.net@gmail.com>:\n> Commit v1.8.1-rc0-3-gfa2364e renamed merge-file.h to merge-blobs.h, but\n> forgot to update the reference of merge-file.h in Makefile. This would\n> break the build of \"po/git.pot\", which depends on $(LOCALIZED_C), then\n> fallback to the missing file \"merge-file.h\".\n>\n> Signed-off-by: Jiang Xin <worldhello.net@gmail.com>\n> ---\n>  Makefile |    2 +-\n>  1 个文件被修改，插入 1 行(+)，删除 1 行(-)\n>\n> diff --git a/Makefile b/Makefile\n> index 1b30d7b..a786d4c 100644\n> --- a/Makefile\n> +++ b/Makefile\n> @@ -649,7 +649,7 @@ LIB_H += list-objects.h\n>  LIB_H += ll-merge.h\n>  LIB_H += log-tree.h\n>  LIB_H += mailmap.h\n> -LIB_H += merge-file.h\n> +LIB_H += merge-blobs.h\n>  LIB_H += merge-recursive.h\n>  LIB_H += mergesort.h\n>  LIB_H += notes-cache.h\n> --\n> 1.8.1.1\n>\n"}]}