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

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>
maint
Junio C Hamano 2008-05-03 17:23:46 -07:00
parent 1392a37721
commit 451244d724
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
diff-lib.c
View File

@ -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 * exists for ce that is a submodule -- it is a submodule that is not
* checked out). Return negative for an error. * 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 (lstat(ce->name, st) < 0) {
if (errno != ENOENT && errno != ENOTDIR) 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, memset(&(dpath->parent[0]), 0,
sizeof(struct combine_diff_parent)*5); sizeof(struct combine_diff_parent)*5);


changed = check_work_tree_entity(ce, &st, symcache); changed = check_removed(ce, &st, symcache);
if (!changed) if (!changed)
dpath->mode = ce_mode_from_stat(ce, st.st_mode); dpath->mode = ce_mode_from_stat(ce, st.st_mode);
else { else {
@ -485,7 +485,7 @@ int run_diff_files(struct rev_info *revs, unsigned int option)
if (ce_uptodate(ce)) if (ce_uptodate(ce))
continue; continue;


changed = check_work_tree_entity(ce, &st, symcache); changed = check_removed(ce, &st, symcache);
if (changed) { if (changed) {
if (changed < 0) { if (changed < 0) {
perror(ce->name); perror(ce->name);
@ -543,7 +543,7 @@ static int get_stat_data(struct cache_entry *ce,
if (!cached) { if (!cached) {
int changed; int changed;
struct stat st; struct stat st;
changed = check_work_tree_entity(ce, &st, cbdata->symcache); changed = check_removed(ce, &st, cbdata->symcache);
if (changed < 0) if (changed < 0)
return -1; return -1;
else if (changed) { else if (changed) {