* [PATCH] Update renamed file merge-file.h in Makefile
@ 2013-01-25 3:06 Jiang Xin
2013-01-25 4:59 ` Jiang Xin
0 siblings, 1 reply; 2+ messages in thread
From: Jiang Xin @ 2013-01-25 3:06 UTC (permalink / raw)
To: Junio C Hamano; +Cc: Git List, 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 <worldhello.net@gmail.com>
---
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] Update renamed file merge-file.h in Makefile
2013-01-25 3:06 [PATCH] Update renamed file merge-file.h in Makefile Jiang Xin
@ 2013-01-25 4:59 ` Jiang Xin
0 siblings, 0 replies; 2+ messages in thread
From: Jiang Xin @ 2013-01-25 4:59 UTC (permalink / raw)
To: Git List
Oops, I find it is already fixed in commit
a60521bc6099ce89d05ef2160d2e3c30a106fda7.
commit a60521bc6099ce89d05ef2160d2e3c30a106fda7
Author: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
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 <ramsay@ramsay1.demon.co.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
(kick back to the list)
2013/1/25 Jiang Xin <worldhello.net@gmail.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 <worldhello.net@gmail.com>
> ---
> 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
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-01-25 5:00 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-01-25 3:06 [PATCH] Update renamed file merge-file.h in Makefile Jiang Xin
2013-01-25 4:59 ` Jiang Xin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).