summaryrefslogtreecommitdiff
path: root/merge-file.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-12-06 23:08:01 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-12-10 07:05:27 (GMT)
commitfa2364ec3457cc107e47d617779f1ffa23647ca4 (patch)
tree0c40c2a03a8f65d5abf5b14c0b8a167ef7288b5b /merge-file.h
parentfb4c62235fee8008d99ef55c4adcb1f7ea9508a3 (diff)
downloadgit-fa2364ec3457cc107e47d617779f1ffa23647ca4.zip
git-fa2364ec3457cc107e47d617779f1ffa23647ca4.tar.gz
git-fa2364ec3457cc107e47d617779f1ffa23647ca4.tar.bz2
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>
Diffstat (limited to 'merge-file.h')
-rw-r--r--merge-file.h7
1 files changed, 0 insertions, 7 deletions
diff --git a/merge-file.h b/merge-file.h
deleted file mode 100644
index 9b3b83a..0000000
--- a/merge-file.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef MERGE_FILE_H
-#define MERGE_FILE_H
-
-extern void *merge_file(const char *path, struct blob *base, struct blob *our,
- struct blob *their, unsigned long *size);
-
-#endif