git/merge-blobs.h at 8ab8d959c6bf2f111590a230c841c352b8cf6518 - git - ClassFun

mirrors/git

mirror of https://github.com/git/git.git synced 2024-12-11 10:54:21 +08:00

Junio C Hamano fa2364ec34 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 <gitster@pobox.com>

2012-12-09 23:05:27 -08:00

9 lines

194 B

C

Raw Blame History

 #ifndef MERGE_BLOBS_H
 #define MERGE_BLOBS_H
 #include "blob.h"
 extern void *merge_blobs(const char *, struct blob *, struct blob *, struct blob *, unsigned long *);
 #endif /* MERGE_BLOBS_H */