Please sign in to comment.
Which merge_file() function do you mean?
There are two different static functions and one global function, all of them called "merge_file()", with different signatures and purposes. Rename them all to reduce confusion in "git grep" output: * Rename the static one in merge-index to "merge_one_path(const char *path)" as that function is about asking an external command to resolve conflicts in one path. * Rename the global one in merge-file.c that is only used by merge-tree to "merge_blobs()", as the function takes three blobs and returns the merged result only in-core, without doing anything to the filesystem. * Rename the one in merge-recursive to "merge_one_file()", just to be fair. Also rename merge-file.[ch] to merge-blobs.[ch]. Signed-off-by: Junio C Hamano <email@example.com>
- Loading branch information...
Showing with 18 additions and 17 deletions.
|@@ -0,0 +1,8 @@|
|+extern void *merge_blobs(const char *, struct blob *, struct blob *, struct blob *, unsigned long *);|
|+#endif /* MERGE_BLOBS_H */|
|@@ -1,7 +0,0 @@|
|-extern void *merge_file(const char *path, struct blob *base, struct blob *our,|
|- struct blob *their, unsigned long *size);|