sha1-name.c: remove implicit dependency on the_index

diff --git a/remote.c b/remote.c
index f7477b8eb67a2065d6b0e35601a6be709b6d0931..670dd448130d20325f5f9f1de8afd0f011535db2 100644 (file)
--- a/remote.c
+++ b/remote.c
@@ -360,7 +360,7 @@ static int handle_config(const char *key, const char *value, void *cb)
                return 0;
        /* Handle remote.<name>.* variables */
        if (*name == '/') {
-               warning("Config remote shorthand cannot begin with '/': %s",
+               warning(_("config remote shorthand cannot begin with '/': %s"),
                        name);
                return 0;
        }
@@ -621,7 +621,7 @@ static void handle_duplicate(struct ref *ref1, struct ref *ref2)
                         * FETCH_HEAD_IGNORE entries always appear at
                         * the end of the list.
                         */
-                       die(_("Internal error"));
+                       BUG("Internal error");
                }
        }
        free(ref2->peer_ref);
@@ -681,7 +681,7 @@ static int match_name_with_pattern(const char *key, const char *name,
        size_t namelen;
        int ret;
        if (!kstar)
-               die("Key '%s' of pattern had no '*'", key);
+               die(_("key '%s' of pattern had no '*'"), key);
        klen = kstar - key;
        ksuffixlen = strlen(kstar + 1);
        namelen = strlen(name);
@@ -691,7 +691,7 @@ static int match_name_with_pattern(const char *key, const char *name,
                struct strbuf sb = STRBUF_INIT;
                const char *vstar = strchr(value, '*');
                if (!vstar)
-                       die("Value '%s' of pattern has no '*'", value);
+                       die(_("value '%s' of pattern has no '*'"), value);
                strbuf_add(&sb, value, vstar - value);
                strbuf_add(&sb, name + klen, namelen - klen - ksuffixlen);
                strbuf_addstr(&sb, vstar + 1);
@@ -708,7 +708,7 @@ static void query_refspecs_multiple(struct refspec *rs,
        int find_src = !query->src;
 
        if (find_src && !query->dst)
-               error(_("query_refspecs_multiple: need either src or dst"));
+               BUG("query_refspecs_multiple: need either src or dst");
 
        for (i = 0; i < rs->nr; i++) {
                struct refspec_item *refspec = &rs->items[i];
@@ -736,7 +736,7 @@ int query_refspecs(struct refspec *rs, struct refspec_item *query)
        char **result = find_src ? &query->src : &query->dst;
 
        if (find_src && !query->dst)
-               return error(_("query_refspecs: need either src or dst"));
+               BUG("query_refspecs: need either src or dst");
 
        for (i = 0; i < rs->nr; i++) {
                struct refspec_item *refspec = &rs->items[i];
@@ -997,12 +997,12 @@ static int match_explicit_lhs(struct ref *src,
                 * way to delete 'other' ref at the remote end.
                 */
                if (try_explicit_object_name(rs->src, match) < 0)
-                       return error(_("src refspec %s does not match any."), rs->src);
+                       return error(_("src refspec %s does not match any"), rs->src);
                if (allocated_match)
                        *allocated_match = 1;
                return 0;
        default:
-               return error(_("src refspec %s matches more than one."), rs->src);
+               return error(_("src refspec %s matches more than one"), rs->src);
        }
 }
 
@@ -1088,7 +1088,7 @@ static int match_explicit(struct ref *src, struct ref *dst,
                if (!dst_value ||
                    ((flag & REF_ISSYMREF) &&
                     !starts_with(dst_value, "refs/heads/")))
-                       die("%s cannot be resolved to branch.",
+                       die(_("%s cannot be resolved to branch"),
                            matched_src->name);
        }
 
@@ -1098,7 +1098,6 @@ static int match_explicit(struct ref *src, struct ref *dst,
        case 0:
                if (starts_with(dst_value, "refs/")) {
                        matched_dst = make_linked_ref(dst_value, dst_tail);
-
                } else if (is_null_oid(&matched_src->new_oid)) {
                        error(_("unable to delete '%s': remote ref does not exist"),
                              dst_value);
@@ -1112,14 +1111,14 @@ static int match_explicit(struct ref *src, struct ref *dst,
                break;
        default:
                matched_dst = NULL;
-               error(_("dst refspec %s matches more than one."),
+               error(_("dst refspec %s matches more than one"),
                      dst_value);
                break;
        }
        if (!matched_dst)
                return -1;
        if (matched_dst->peer_ref)
-               return error(_("dst ref %s receives from more than one src."),
+               return error(_("dst ref %s receives from more than one src"),
                             matched_dst->name);
        else {
                matched_dst->peer_ref = allocated_src ?
@@ -1838,7 +1837,7 @@ int get_fetch_map(const struct ref *remote_refs,
                        ref_map = get_remote_ref(remote_refs, name);
                }
                if (!missing_ok && !ref_map)
-                       die("Couldn't find remote ref %s", name);
+                       die(_("couldn't find remote ref %s"), name);
                if (ref_map) {
                        ref_map->peer_ref = get_local_ref(refspec->dst);
                        if (ref_map->peer_ref && refspec->force)
@@ -1946,7 +1945,7 @@ int stat_tracking_info(struct branch *branch, int *num_ours, int *num_theirs,
        repo_init_revisions(the_repository, &revs, NULL);
        setup_revisions(argv.argc, argv.argv, &revs, NULL);
        if (prepare_revision_walk(&revs))
-               die("revision walk setup failed");
+               die(_("revision walk setup failed"));
 
        /* ... and count the commits on each side. */
        while (1) {
@@ -2219,7 +2218,8 @@ static int parse_push_cas_option(struct push_cas_option *cas, const char *arg, i
        else if (!colon[1])
                oidclr(&entry->expect);
        else if (get_oid(colon + 1, &entry->expect))
-               return error(_("cannot parse expected object name '%s'"), colon + 1);
+               return error(_("cannot parse expected object name '%s'"),
+                            colon + 1);
        return 0;
 }