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

Make the exit code of add_file_to_index actually useful 

Update the programs which used the function (as add_file_to_cache).

Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Alex Riesen 2008-05-12 19:57:45 +02:00 committed by Junio C Hamano
parent 64c0d71ce9
commit 960b8ad1b1
4 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
builtin-add.c
View File

@ -94,7 +94,8 @@ static void update_callback(struct diff_queue_struct *q,
case DIFF_STATUS_UNMERGED:
case DIFF_STATUS_MODIFIED:
case DIFF_STATUS_TYPE_CHANGED:
add_file_to_cache(path, verbose);
if (add_file_to_cache(path, verbose))
die("updating files failed");
break;
case DIFF_STATUS_DELETED:
remove_file_from_cache(path);
@ -254,7 +255,8 @@ int cmd_add(int argc, const char **argv, const char *prefix)
}

for (i = 0; i < dir.nr; i++)
add_file_to_cache(dir.entries[i]->name, verbose);
if (add_file_to_cache(dir.entries[i]->name, verbose))
die("adding files failed");

finish:
if (active_cache_changed) {

7
builtin-commit.c
View File

@ -178,9 +178,10 @@ static void add_remove_files(struct path_list *list)
struct stat st;
struct path_list_item *p = &(list->items[i]);

if (!lstat(p->path, &st))
add_to_cache(p->path, &st, 0);
else
if (!lstat(p->path, &st)) {
if (add_to_cache(p->path, &st, 0))
die("updating files failed");
} else
remove_file_from_cache(p->path);
}
}

3
builtin-mv.c
View File

@ -256,7 +256,8 @@ int cmd_mv(int argc, const char **argv, const char *prefix)

for (i = 0; i < added.nr; i++) {
const char *path = added.items[i].path;
add_file_to_cache(path, verbose);
if (add_file_to_cache(path, verbose))
die("updating index entries failed");
}

for (i = 0; i < deleted.nr; i++)

6
read-cache.c
View File

@ -470,7 +470,7 @@ int add_to_index(struct index_state *istate, const char *path, struct stat *st,
unsigned ce_option = CE_MATCH_IGNORE_VALID|CE_MATCH_RACY_IS_DIRTY;

if (!S_ISREG(st_mode) && !S_ISLNK(st_mode) && !S_ISDIR(st_mode))
die("%s: can only add regular files, symbolic links or git-directories", path);
return error("%s: can only add regular files, symbolic links or git-directories", path);

namelen = strlen(path);
if (S_ISDIR(st_mode)) {
@ -505,12 +505,12 @@ int add_to_index(struct index_state *istate, const char *path, struct stat *st,
return 0;
}
if (index_path(ce->sha1, path, st, 1))
die("unable to index file %s", path);
return error("unable to index file %s", path);
if (ignore_case && alias && different_name(ce, alias))
ce = create_alias_ce(ce, alias);
ce->ce_flags |= CE_ADDED;
if (add_index_entry(istate, ce, ADD_CACHE_OK_TO_ADD|ADD_CACHE_OK_TO_REPLACE))
die("unable to add %s to index",path);
return error("unable to add %s to index",path);
if (verbose)
printf("add '%s'\n", path);
return 0;