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

newren · gitster · commit aacb82de3ff8 · 2011-08-14T14:19:35.000-07:00
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 &lt;newren@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/merge-recursive.c b/merge-recursive.c
@@ -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);
 }
 
-static int would_lose_untracked(const char *path)
+static int was_tracked(const char *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])) {
 		case 0:
 		case 2:
-			return 0;
+			return 1;
 		}
 		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)

Original file line number	Diff line number	Diff line change
`@@ -621,7 +621,7 @@ static int dir_in_way(const char *path, int check_working_copy)`
`621`	`621`	`return check_working_copy && !lstat(path, &st) && S_ISDIR(st.st_mode);`
`622`	`622`	`}`
`623`	`623`
`624`		`-static int would_lose_untracked(const char *path)`
	`624`	`+static int was_tracked(const char *path)`
`625`	`625`	`{`
`626`	`626`	`int pos = cache_name_pos(path, strlen(path));`
`627`	`627`
`@@ -638,11 +638,16 @@ static int would_lose_untracked(const char *path)`
`638`	`638`	`switch (ce_stage(active_cache[pos])) {`
`639`	`639`	`case 0:`
`640`	`640`	`case 2:`
`641`		`- return 0;`
	`641`	`+ return 1;`
`642`	`642`	`}`
`643`	`643`	`pos++;`
`644`	`644`	`}`
`645`		`- return file_exists(path);`
	`645`	`+ return 0;`
	`646`	`+}`
	`647`	`+`
	`648`	`+static int would_lose_untracked(const char *path)`
	`649`	`+{`
	`650`	`+ return !was_tracked(path) && file_exists(path);`
`646`	`651`	`}`
`647`	`652`
`648`	`653`	`static int make_room_for_path(const char *path)`