git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH] Makefile: Replace merge-file.h with merge-blobs.h in LIB_H

From
Ramsay Jones <ramsay@ramsay1.demon.co.uk>
Date
Jan 22, 2013, 16:47 UTC
Message-ID
<50FEC2B3.3010000@ramsay1.demon.co.uk>

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>
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
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
Next: Junio C Hamano
Message 1 of 2 in “Makefile: Replace merge-file.h with merge-blobs.h in LIB_H”
  1. Makefile: Replace merge-file.h with merge-blobs.h in LIB_HRamsay Jones, Jan 22, 2013
  2. Junio C HamanoJan 22, 2013

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.