summaryrefslogtreecommitdiff
path: root/diff-lib.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-05-03 17:23:46 -0700
committerJunio C Hamano <gitster@pobox.com>2008-05-04 17:41:27 -0700
commit451244d724f921eca9ffaf526d45c825f7c6f4eb (patch)
tree6a1662625c382a44ea67f407165bb2dc8b9c0403 /diff-lib.c
parent1392a377219adfee7cc7532e3c60e51d79ab40b1 (diff)
downloadgit-451244d724f921eca9ffaf526d45c825f7c6f4eb.tar.gz
diff-lib.c: rename check_work_tree_entity()
The function is about checking for removed work tree item, so name it accordingly to avoid future confusion. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diff-lib.c')
-rw-r--r--diff-lib.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/diff-lib.c b/diff-lib.c
index e0ebcdcf54..4a3e25536c 100644
--- a/diff-lib.c
+++ b/diff-lib.c
@@ -347,7 +347,7 @@ int run_diff_files_cmd(struct rev_info *revs, int argc, const char **argv)
* exists for ce that is a submodule -- it is a submodule that is not
* checked out). Return negative for an error.
*/
-static int check_work_tree_entity(const struct cache_entry *ce, struct stat *st, char *symcache)
+static int check_removed(const struct cache_entry *ce, struct stat *st, char *symcache)
{
if (lstat(ce->name, st) < 0) {
if (errno != ENOENT && errno != ENOTDIR)
@@ -421,7 +421,7 @@ int run_diff_files(struct rev_info *revs, unsigned int option)
memset(&(dpath->parent[0]), 0,
sizeof(struct combine_diff_parent)*5);
- changed = check_work_tree_entity(ce, &st, symcache);
+ changed = check_removed(ce, &st, symcache);
if (!changed)
dpath->mode = ce_mode_from_stat(ce, st.st_mode);
else {
@@ -485,7 +485,7 @@ int run_diff_files(struct rev_info *revs, unsigned int option)
if (ce_uptodate(ce))
continue;
- changed = check_work_tree_entity(ce, &st, symcache);
+ changed = check_removed(ce, &st, symcache);
if (changed) {
if (changed < 0) {
perror(ce->name);
@@ -543,7 +543,7 @@ static int get_stat_data(struct cache_entry *ce,
if (!cached) {
int changed;
struct stat st;
- changed = check_work_tree_entity(ce, &st, cbdata->symcache);
+ changed = check_removed(ce, &st, cbdata->symcache);
if (changed < 0)
return -1;
else if (changed) {