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

update-index: refactor mark_valid() in preparation for new options

Browse Source 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Nguyễn Thái Ngọc Duy 2009-08-20 20:46:55 +07:00 committed by Junio C Hamano
parent 540e694b13
commit 83b327ba4e
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
builtin-update-index.c
View File

@ -24,8 +24,8 @@ static int info_only;
static int force_remove; static int force_remove;
static int verbose; static int verbose;
static int mark_valid_only; static int mark_valid_only;
#define MARK_VALID 1 #define MARK_FLAG 1
#define UNMARK_VALID 2 #define UNMARK_FLAG 2
static void report(const char *fmt, ...) static void report(const char *fmt, ...)
{ {
@ -40,19 +40,15 @@ static void report(const char *fmt, ...)
va_end(vp); va_end(vp);
} }
static int mark_valid(const char *path) static int mark_ce_flags(const char *path, int flag, int mark)
{ {
int namelen = strlen(path); int namelen = strlen(path);
int pos = cache_name_pos(path, namelen); int pos = cache_name_pos(path, namelen);
if (0 <= pos) { if (0 <= pos) {
switch (mark_valid_only) { if (mark)
case MARK_VALID: active_cache[pos]->ce_flags |= flag;
active_cache[pos]->ce_flags |= CE_VALID; else
break; active_cache[pos]->ce_flags &= ~flag;
case UNMARK_VALID:
active_cache[pos]->ce_flags &= ~CE_VALID;
break;
}
cache_tree_invalidate_path(active_cache_tree, path); cache_tree_invalidate_path(active_cache_tree, path);
active_cache_changed = 1; active_cache_changed = 1;
return 0; return 0;
@ -276,7 +272,7 @@ static void update_one(const char *path, const char *prefix, int prefix_length)
goto free_return; goto free_return;
} }
if (mark_valid_only) { if (mark_valid_only) {
if (mark_valid(p)) if (mark_ce_flags(p, CE_VALID, mark_valid_only == MARK_FLAG))
die("Unable to mark file %s", path); die("Unable to mark file %s", path);
goto free_return; goto free_return;
} }
@ -647,11 +643,11 @@ int cmd_update_index(int argc, const char **argv, const char *prefix)
continue; continue;
} }
if (!strcmp(path, "--assume-unchanged")) { if (!strcmp(path, "--assume-unchanged")) {
mark_valid_only = MARK_VALID; mark_valid_only = MARK_FLAG;
continue; continue;
} }
if (!strcmp(path, "--no-assume-unchanged")) { if (!strcmp(path, "--no-assume-unchanged")) {
mark_valid_only = UNMARK_VALID; mark_valid_only = UNMARK_FLAG;
continue; continue;
} }
if (!strcmp(path, "--info-only")) { if (!strcmp(path, "--info-only")) {