# [PATCH] Update renamed file merge-file.h in Makefile 2 messages from 2013-01-25 to 2013-01-25. Participants: Jiang Xin. Thread: https://gitlist.dev/t/32718 ## Jiang Xin, 2013-01-25 03:06 Subject: [PATCH] Update renamed file merge-file.h in Makefile Message-ID: <1359083188-31866-1-git-send-email-worldhello.net@gmail.com> URL: https://gitlist.dev/e/1359083188-31866-1-git-send-email-worldhello.net%40gmail.com ``` Commit v1.8.1-rc0-3-gfa2364e renamed merge-file.h to merge-blobs.h, but forgot to update the reference of merge-file.h in Makefile. This would break the build of "po/git.pot", which depends on $(LOCALIZED_C), then fallback to the missing file "merge-file.h". Signed-off-by: Jiang Xin --- Makefile | 2 +- 1 个文件被修改，插入 1 行(+)，删除 1 行(-) diff --git a/Makefile b/Makefile index 1b30d7b..a786d4c 100644 --- a/Makefile +++ b/Makefile @@ -649,7 +649,7 @@ LIB_H += list-objects.h LIB_H += ll-merge.h LIB_H += log-tree.h LIB_H += mailmap.h -LIB_H += merge-file.h +LIB_H += merge-blobs.h LIB_H += merge-recursive.h LIB_H += mergesort.h LIB_H += notes-cache.h -- 1.8.1.1 ``` ## Jiang Xin, 2013-01-25 04:59 Subject: Re: [PATCH] Update renamed file merge-file.h in Makefile Message-ID: URL: https://gitlist.dev/e/CANYiYbHWE%2B88DbSoA2EgcZjCh%2B9YTcHGQhumSUkx_ovXY6FSDQ%40mail.gmail.com In-Reply-To: <1359083188-31866-1-git-send-email-worldhello.net@gmail.com> ``` Oops, I find it is already fixed in commit a60521bc6099ce89d05ef2160d2e3c30a106fda7. commit a60521bc6099ce89d05ef2160d2e3c30a106fda7 Author: Ramsay Jones Date: Tue Jan 22 16:47:47 2013 +0000 Makefile: Replace merge-file.h with merge-blobs.h in LIB_H Commit fa2364ec ("Which merge_file() function do you mean?", 06-12-2012) renamed the files merge-file.[ch] to merge-blobs.[ch], but forgot to rename the header file in the definition of the LIB_H macro. Signed-off-by: Ramsay Jones Signed-off-by: Junio C Hamano (kick back to the list) 2013/1/25 Jiang Xin : > Commit v1.8.1-rc0-3-gfa2364e renamed merge-file.h to merge-blobs.h, but > forgot to update the reference of merge-file.h in Makefile. This would > break the build of "po/git.pot", which depends on $(LOCALIZED_C), then > fallback to the missing file "merge-file.h". > > Signed-off-by: Jiang Xin > --- > Makefile | 2 +- > 1 个文件被修改，插入 1 行(+)，删除 1 行(-) > > diff --git a/Makefile b/Makefile > index 1b30d7b..a786d4c 100644 > --- a/Makefile > +++ b/Makefile > @@ -649,7 +649,7 @@ LIB_H += list-objects.h > LIB_H += ll-merge.h > LIB_H += log-tree.h > LIB_H += mailmap.h > -LIB_H += merge-file.h > +LIB_H += merge-blobs.h > LIB_H += merge-recursive.h > LIB_H += mergesort.h > LIB_H += notes-cache.h > -- > 1.8.1.1 > ```