undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge-recursive: Split was_tracked() out of would_lose_untracked()

Browse Source 
Checking whether a filename was part of stage 0 or stage 2 is code that we
would like to be able to call from a few other places without also
lstat()-ing the file to see if it exists in the working copy.

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Elijah Newren 2011-08-11 23:19:59 -06:00 committed by Junio C Hamano
parent 70cc3d36eb
commit aacb82de3f
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
merge-recursive.c
View File

@ -621,7 +621,7 @@ static int dir_in_way(const char *path, int check_working_copy)
return check_working_copy && !lstat(path, &st) && S_ISDIR(st.st_mode); return check_working_copy && !lstat(path, &st) && S_ISDIR(st.st_mode);
} }
static int would_lose_untracked(const char *path) static int was_tracked(const char *path)
{ {
int pos = cache_name_pos(path, strlen(path)); int pos = cache_name_pos(path, strlen(path));
@ -638,11 +638,16 @@ static int would_lose_untracked(const char *path)
switch (ce_stage(active_cache[pos])) { switch (ce_stage(active_cache[pos])) {
case 0: case 0:
case 2: case 2:
return 0; return 1;
} }
pos++; pos++;
} }
return file_exists(path); return 0;
}
static int would_lose_untracked(const char *path)
{
return !was_tracked(path) && file_exists(path);
} }
static int make_room_for_path(const char *path) static int make_room_for_path(const char *path)