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>

diff --git a/builtin-add.c b/builtin-add.c
index 4a91e3eb118850882fbc22e8d8f37e8bbfaa7617..4d72ab678dd29f71851fb8b80ff7b056e2a38e4b 100644 (file)
--- a/builtin-add.c
+++ b/builtin-add.c
@@ -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:
                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);
                        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++)
        }
 
        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) {
 
  finish:
        if (active_cache_changed) {

diff --git a/builtin-commit.c b/builtin-commit.c
index a65c2b8c37c2f7785d76ec1f4e3692ee52dab8e9..ae29d35d76a602d520752801c6a1b6ebfcb9ae7a 100644 (file)
--- a/builtin-commit.c
+++ b/builtin-commit.c
@@ -178,9 +178,10 @@ static void add_remove_files(struct path_list *list)
                struct stat st;
                struct path_list_item *p = &(list->items[i]);
 
                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);
        }
 }
                        remove_file_from_cache(p->path);
        }
 }

diff --git a/builtin-mv.c b/builtin-mv.c
index 94f6dd2aad2da512bab0be2e84859eced6553cc9..fb8ffb41aaba5f6e2a8cc13207a2f2c407d6c91d 100644 (file)
--- a/builtin-mv.c
+++ b/builtin-mv.c
@@ -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;
 
                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++)
                }
 
                for (i = 0; i < deleted.nr; i++)

diff --git a/read-cache.c b/read-cache.c
index 0382804e7694e9a0e87cc2dc8340187ddeea2d64..8b467f8f415b68db6e6ea83720ce6ae63dedb9e4 100644 (file)
--- a/read-cache.c
+++ b/read-cache.c
@@ -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))
        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)) {
 
        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))
                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))
        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;
        if (verbose)
                printf("add '%s'\n", path);
        return 0;