kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

merge-recursive: make a few functions static. 

Signed-off-by: Junio C Hamano <junkio@cox.net>
maint
Junio C Hamano 2006-10-23 00:46:15 -07:00
parent 9926ba98a4
commit 9fe0d87da3
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
merge-recursive.c
View File

@ -427,8 +427,9 @@ static struct path_list *get_renames(struct tree *tree,
return renames; return renames;
} }


int update_stages(const char *path, struct diff_filespec *o, static int update_stages(const char *path, struct diff_filespec *o,
struct diff_filespec *a, struct diff_filespec *b, int clear) struct diff_filespec *a, struct diff_filespec *b,
int clear)
{ {
int options = ADD_CACHE_OK_TO_ADD | ADD_CACHE_OK_TO_REPLACE; int options = ADD_CACHE_OK_TO_ADD | ADD_CACHE_OK_TO_REPLACE;
if (clear) if (clear)
@ -468,7 +469,7 @@ static int remove_path(const char *name)
return ret; return ret;
} }


int remove_file(int clean, const char *path) static int remove_file(int clean, const char *path)
{ {
int update_cache = index_only || clean; int update_cache = index_only || clean;
int update_working_directory = !index_only; int update_working_directory = !index_only;
@ -537,11 +538,11 @@ static void flush_buffer(int fd, const char *buf, unsigned long size)
} }
} }


void update_file_flags(const unsigned char *sha, static void update_file_flags(const unsigned char *sha,
unsigned mode, unsigned mode,
const char *path, const char *path,
int update_cache, int update_cache,
int update_wd) int update_wd)
{ {
if (index_only) if (index_only)
update_wd = 0; update_wd = 0;
@ -586,10 +587,10 @@ void update_file_flags(const unsigned char *sha,
add_cacheinfo(mode, sha, path, 0, update_wd, ADD_CACHE_OK_TO_ADD); add_cacheinfo(mode, sha, path, 0, update_wd, ADD_CACHE_OK_TO_ADD);
} }


void update_file(int clean, static void update_file(int clean,
const unsigned char *sha, const unsigned char *sha,
unsigned mode, unsigned mode,
const char *path) const char *path)
{ {
update_file_flags(sha, mode, path, index_only || clean, !index_only); update_file_flags(sha, mode, path, index_only || clean, !index_only);
} }