sha1_name.con commit remote.c: spell __attribute__ correctly (060e776)
   1#include "cache.h"
   2#include "tag.h"
   3#include "commit.h"
   4#include "tree.h"
   5#include "blob.h"
   6#include "tree-walk.h"
   7#include "refs.h"
   8#include "remote.h"
   9
  10static int get_sha1_oneline(const char *, unsigned char *, struct commit_list *);
  11
  12typedef int (*disambiguate_hint_fn)(const unsigned char *, void *);
  13
  14struct disambiguate_state {
  15        disambiguate_hint_fn fn;
  16        void *cb_data;
  17        unsigned char candidate[20];
  18        unsigned candidate_exists:1;
  19        unsigned candidate_checked:1;
  20        unsigned candidate_ok:1;
  21        unsigned disambiguate_fn_used:1;
  22        unsigned ambiguous:1;
  23        unsigned always_call_fn:1;
  24};
  25
  26static void update_candidates(struct disambiguate_state *ds, const unsigned char *current)
  27{
  28        if (ds->always_call_fn) {
  29                ds->ambiguous = ds->fn(current, ds->cb_data) ? 1 : 0;
  30                return;
  31        }
  32        if (!ds->candidate_exists) {
  33                /* this is the first candidate */
  34                hashcpy(ds->candidate, current);
  35                ds->candidate_exists = 1;
  36                return;
  37        } else if (!hashcmp(ds->candidate, current)) {
  38                /* the same as what we already have seen */
  39                return;
  40        }
  41
  42        if (!ds->fn) {
  43                /* cannot disambiguate between ds->candidate and current */
  44                ds->ambiguous = 1;
  45                return;
  46        }
  47
  48        if (!ds->candidate_checked) {
  49                ds->candidate_ok = ds->fn(ds->candidate, ds->cb_data);
  50                ds->disambiguate_fn_used = 1;
  51                ds->candidate_checked = 1;
  52        }
  53
  54        if (!ds->candidate_ok) {
  55                /* discard the candidate; we know it does not satisfy fn */
  56                hashcpy(ds->candidate, current);
  57                ds->candidate_checked = 0;
  58                return;
  59        }
  60
  61        /* if we reach this point, we know ds->candidate satisfies fn */
  62        if (ds->fn(current, ds->cb_data)) {
  63                /*
  64                 * if both current and candidate satisfy fn, we cannot
  65                 * disambiguate.
  66                 */
  67                ds->candidate_ok = 0;
  68                ds->ambiguous = 1;
  69        }
  70
  71        /* otherwise, current can be discarded and candidate is still good */
  72}
  73
  74static void find_short_object_filename(int len, const char *hex_pfx, struct disambiguate_state *ds)
  75{
  76        struct alternate_object_database *alt;
  77        char hex[40];
  78        static struct alternate_object_database *fakeent;
  79
  80        if (!fakeent) {
  81                /*
  82                 * Create a "fake" alternate object database that
  83                 * points to our own object database, to make it
  84                 * easier to get a temporary working space in
  85                 * alt->name/alt->base while iterating over the
  86                 * object databases including our own.
  87                 */
  88                const char *objdir = get_object_directory();
  89                int objdir_len = strlen(objdir);
  90                int entlen = objdir_len + 43;
  91                fakeent = xmalloc(sizeof(*fakeent) + entlen);
  92                memcpy(fakeent->base, objdir, objdir_len);
  93                fakeent->name = fakeent->base + objdir_len + 1;
  94                fakeent->name[-1] = '/';
  95        }
  96        fakeent->next = alt_odb_list;
  97
  98        sprintf(hex, "%.2s", hex_pfx);
  99        for (alt = fakeent; alt && !ds->ambiguous; alt = alt->next) {
 100                struct dirent *de;
 101                DIR *dir;
 102                sprintf(alt->name, "%.2s/", hex_pfx);
 103                dir = opendir(alt->base);
 104                if (!dir)
 105                        continue;
 106
 107                while (!ds->ambiguous && (de = readdir(dir)) != NULL) {
 108                        unsigned char sha1[20];
 109
 110                        if (strlen(de->d_name) != 38)
 111                                continue;
 112                        if (memcmp(de->d_name, hex_pfx + 2, len - 2))
 113                                continue;
 114                        memcpy(hex + 2, de->d_name, 38);
 115                        if (!get_sha1_hex(hex, sha1))
 116                                update_candidates(ds, sha1);
 117                }
 118                closedir(dir);
 119        }
 120}
 121
 122static int match_sha(unsigned len, const unsigned char *a, const unsigned char *b)
 123{
 124        do {
 125                if (*a != *b)
 126                        return 0;
 127                a++;
 128                b++;
 129                len -= 2;
 130        } while (len > 1);
 131        if (len)
 132                if ((*a ^ *b) & 0xf0)
 133                        return 0;
 134        return 1;
 135}
 136
 137static void unique_in_pack(int len,
 138                          const unsigned char *bin_pfx,
 139                           struct packed_git *p,
 140                           struct disambiguate_state *ds)
 141{
 142        uint32_t num, last, i, first = 0;
 143        const unsigned char *current = NULL;
 144
 145        open_pack_index(p);
 146        num = p->num_objects;
 147        last = num;
 148        while (first < last) {
 149                uint32_t mid = (first + last) / 2;
 150                const unsigned char *current;
 151                int cmp;
 152
 153                current = nth_packed_object_sha1(p, mid);
 154                cmp = hashcmp(bin_pfx, current);
 155                if (!cmp) {
 156                        first = mid;
 157                        break;
 158                }
 159                if (cmp > 0) {
 160                        first = mid+1;
 161                        continue;
 162                }
 163                last = mid;
 164        }
 165
 166        /*
 167         * At this point, "first" is the location of the lowest object
 168         * with an object name that could match "bin_pfx".  See if we have
 169         * 0, 1 or more objects that actually match(es).
 170         */
 171        for (i = first; i < num && !ds->ambiguous; i++) {
 172                current = nth_packed_object_sha1(p, i);
 173                if (!match_sha(len, bin_pfx, current))
 174                        break;
 175                update_candidates(ds, current);
 176        }
 177}
 178
 179static void find_short_packed_object(int len, const unsigned char *bin_pfx,
 180                                     struct disambiguate_state *ds)
 181{
 182        struct packed_git *p;
 183
 184        prepare_packed_git();
 185        for (p = packed_git; p && !ds->ambiguous; p = p->next)
 186                unique_in_pack(len, bin_pfx, p, ds);
 187}
 188
 189#define SHORT_NAME_NOT_FOUND (-1)
 190#define SHORT_NAME_AMBIGUOUS (-2)
 191
 192static int finish_object_disambiguation(struct disambiguate_state *ds,
 193                                        unsigned char *sha1)
 194{
 195        if (ds->ambiguous)
 196                return SHORT_NAME_AMBIGUOUS;
 197
 198        if (!ds->candidate_exists)
 199                return SHORT_NAME_NOT_FOUND;
 200
 201        if (!ds->candidate_checked)
 202                /*
 203                 * If this is the only candidate, there is no point
 204                 * calling the disambiguation hint callback.
 205                 *
 206                 * On the other hand, if the current candidate
 207                 * replaced an earlier candidate that did _not_ pass
 208                 * the disambiguation hint callback, then we do have
 209                 * more than one objects that match the short name
 210                 * given, so we should make sure this one matches;
 211                 * otherwise, if we discovered this one and the one
 212                 * that we previously discarded in the reverse order,
 213                 * we would end up showing different results in the
 214                 * same repository!
 215                 */
 216                ds->candidate_ok = (!ds->disambiguate_fn_used ||
 217                                    ds->fn(ds->candidate, ds->cb_data));
 218
 219        if (!ds->candidate_ok)
 220                return SHORT_NAME_AMBIGUOUS;
 221
 222        hashcpy(sha1, ds->candidate);
 223        return 0;
 224}
 225
 226static int disambiguate_commit_only(const unsigned char *sha1, void *cb_data_unused)
 227{
 228        int kind = sha1_object_info(sha1, NULL);
 229        return kind == OBJ_COMMIT;
 230}
 231
 232static int disambiguate_committish_only(const unsigned char *sha1, void *cb_data_unused)
 233{
 234        struct object *obj;
 235        int kind;
 236
 237        kind = sha1_object_info(sha1, NULL);
 238        if (kind == OBJ_COMMIT)
 239                return 1;
 240        if (kind != OBJ_TAG)
 241                return 0;
 242
 243        /* We need to do this the hard way... */
 244        obj = deref_tag(parse_object(sha1), NULL, 0);
 245        if (obj && obj->type == OBJ_COMMIT)
 246                return 1;
 247        return 0;
 248}
 249
 250static int disambiguate_tree_only(const unsigned char *sha1, void *cb_data_unused)
 251{
 252        int kind = sha1_object_info(sha1, NULL);
 253        return kind == OBJ_TREE;
 254}
 255
 256static int disambiguate_treeish_only(const unsigned char *sha1, void *cb_data_unused)
 257{
 258        struct object *obj;
 259        int kind;
 260
 261        kind = sha1_object_info(sha1, NULL);
 262        if (kind == OBJ_TREE || kind == OBJ_COMMIT)
 263                return 1;
 264        if (kind != OBJ_TAG)
 265                return 0;
 266
 267        /* We need to do this the hard way... */
 268        obj = deref_tag(lookup_object(sha1), NULL, 0);
 269        if (obj && (obj->type == OBJ_TREE || obj->type == OBJ_COMMIT))
 270                return 1;
 271        return 0;
 272}
 273
 274static int disambiguate_blob_only(const unsigned char *sha1, void *cb_data_unused)
 275{
 276        int kind = sha1_object_info(sha1, NULL);
 277        return kind == OBJ_BLOB;
 278}
 279
 280static int prepare_prefixes(const char *name, int len,
 281                            unsigned char *bin_pfx,
 282                            char *hex_pfx)
 283{
 284        int i;
 285
 286        hashclr(bin_pfx);
 287        memset(hex_pfx, 'x', 40);
 288        for (i = 0; i < len ;i++) {
 289                unsigned char c = name[i];
 290                unsigned char val;
 291                if (c >= '0' && c <= '9')
 292                        val = c - '0';
 293                else if (c >= 'a' && c <= 'f')
 294                        val = c - 'a' + 10;
 295                else if (c >= 'A' && c <='F') {
 296                        val = c - 'A' + 10;
 297                        c -= 'A' - 'a';
 298                }
 299                else
 300                        return -1;
 301                hex_pfx[i] = c;
 302                if (!(i & 1))
 303                        val <<= 4;
 304                bin_pfx[i >> 1] |= val;
 305        }
 306        return 0;
 307}
 308
 309static int get_short_sha1(const char *name, int len, unsigned char *sha1,
 310                          unsigned flags)
 311{
 312        int status;
 313        char hex_pfx[40];
 314        unsigned char bin_pfx[20];
 315        struct disambiguate_state ds;
 316        int quietly = !!(flags & GET_SHA1_QUIETLY);
 317
 318        if (len < MINIMUM_ABBREV || len > 40)
 319                return -1;
 320        if (prepare_prefixes(name, len, bin_pfx, hex_pfx) < 0)
 321                return -1;
 322
 323        prepare_alt_odb();
 324
 325        memset(&ds, 0, sizeof(ds));
 326        if (flags & GET_SHA1_COMMIT)
 327                ds.fn = disambiguate_commit_only;
 328        else if (flags & GET_SHA1_COMMITTISH)
 329                ds.fn = disambiguate_committish_only;
 330        else if (flags & GET_SHA1_TREE)
 331                ds.fn = disambiguate_tree_only;
 332        else if (flags & GET_SHA1_TREEISH)
 333                ds.fn = disambiguate_treeish_only;
 334        else if (flags & GET_SHA1_BLOB)
 335                ds.fn = disambiguate_blob_only;
 336
 337        find_short_object_filename(len, hex_pfx, &ds);
 338        find_short_packed_object(len, bin_pfx, &ds);
 339        status = finish_object_disambiguation(&ds, sha1);
 340
 341        if (!quietly && (status == SHORT_NAME_AMBIGUOUS))
 342                return error("short SHA1 %.*s is ambiguous.", len, hex_pfx);
 343        return status;
 344}
 345
 346int for_each_abbrev(const char *prefix, each_abbrev_fn fn, void *cb_data)
 347{
 348        char hex_pfx[40];
 349        unsigned char bin_pfx[20];
 350        struct disambiguate_state ds;
 351        int len = strlen(prefix);
 352
 353        if (len < MINIMUM_ABBREV || len > 40)
 354                return -1;
 355        if (prepare_prefixes(prefix, len, bin_pfx, hex_pfx) < 0)
 356                return -1;
 357
 358        prepare_alt_odb();
 359
 360        memset(&ds, 0, sizeof(ds));
 361        ds.always_call_fn = 1;
 362        ds.cb_data = cb_data;
 363        ds.fn = fn;
 364
 365        find_short_object_filename(len, hex_pfx, &ds);
 366        find_short_packed_object(len, bin_pfx, &ds);
 367        return ds.ambiguous;
 368}
 369
 370const char *find_unique_abbrev(const unsigned char *sha1, int len)
 371{
 372        int status, exists;
 373        static char hex[41];
 374
 375        memcpy(hex, sha1_to_hex(sha1), 40);
 376        if (len == 40 || !len)
 377                return hex;
 378        exists = has_sha1_file(sha1);
 379        while (len < 40) {
 380                unsigned char sha1_ret[20];
 381                status = get_short_sha1(hex, len, sha1_ret, GET_SHA1_QUIETLY);
 382                if (exists
 383                    ? !status
 384                    : status == SHORT_NAME_NOT_FOUND) {
 385                        hex[len] = 0;
 386                        return hex;
 387                }
 388                len++;
 389        }
 390        return hex;
 391}
 392
 393static int ambiguous_path(const char *path, int len)
 394{
 395        int slash = 1;
 396        int cnt;
 397
 398        for (cnt = 0; cnt < len; cnt++) {
 399                switch (*path++) {
 400                case '\0':
 401                        break;
 402                case '/':
 403                        if (slash)
 404                                break;
 405                        slash = 1;
 406                        continue;
 407                case '.':
 408                        continue;
 409                default:
 410                        slash = 0;
 411                        continue;
 412                }
 413                break;
 414        }
 415        return slash;
 416}
 417
 418static inline int at_mark(const char *string, int len,
 419                          const char **suffix, int nr)
 420{
 421        int i;
 422
 423        for (i = 0; i < nr; i++) {
 424                int suffix_len = strlen(suffix[i]);
 425                if (suffix_len <= len
 426                    && !memcmp(string, suffix[i], suffix_len))
 427                        return suffix_len;
 428        }
 429        return 0;
 430}
 431
 432static inline int upstream_mark(const char *string, int len)
 433{
 434        const char *suffix[] = { "@{upstream}", "@{u}" };
 435        return at_mark(string, len, suffix, ARRAY_SIZE(suffix));
 436}
 437
 438static inline int push_mark(const char *string, int len)
 439{
 440        const char *suffix[] = { "@{push}" };
 441        return at_mark(string, len, suffix, ARRAY_SIZE(suffix));
 442}
 443
 444static int get_sha1_1(const char *name, int len, unsigned char *sha1, unsigned lookup_flags);
 445static int interpret_nth_prior_checkout(const char *name, int namelen, struct strbuf *buf);
 446
 447static int get_sha1_basic(const char *str, int len, unsigned char *sha1,
 448                          unsigned int flags)
 449{
 450        static const char *warn_msg = "refname '%.*s' is ambiguous.";
 451        static const char *object_name_msg = N_(
 452        "Git normally never creates a ref that ends with 40 hex characters\n"
 453        "because it will be ignored when you just specify 40-hex. These refs\n"
 454        "may be created by mistake. For example,\n"
 455        "\n"
 456        "  git checkout -b $br $(git rev-parse ...)\n"
 457        "\n"
 458        "where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
 459        "examine these refs and maybe delete them. Turn this message off by\n"
 460        "running \"git config advice.objectNameWarning false\"");
 461        unsigned char tmp_sha1[20];
 462        char *real_ref = NULL;
 463        int refs_found = 0;
 464        int at, reflog_len, nth_prior = 0;
 465
 466        if (len == 40 && !get_sha1_hex(str, sha1)) {
 467                if (warn_ambiguous_refs && warn_on_object_refname_ambiguity) {
 468                        refs_found = dwim_ref(str, len, tmp_sha1, &real_ref);
 469                        if (refs_found > 0) {
 470                                warning(warn_msg, len, str);
 471                                if (advice_object_name_warning)
 472                                        fprintf(stderr, "%s\n", _(object_name_msg));
 473                        }
 474                        free(real_ref);
 475                }
 476                return 0;
 477        }
 478
 479        /* basic@{time or number or -number} format to query ref-log */
 480        reflog_len = at = 0;
 481        if (len && str[len-1] == '}') {
 482                for (at = len-4; at >= 0; at--) {
 483                        if (str[at] == '@' && str[at+1] == '{') {
 484                                if (str[at+2] == '-') {
 485                                        if (at != 0)
 486                                                /* @{-N} not at start */
 487                                                return -1;
 488                                        nth_prior = 1;
 489                                        continue;
 490                                }
 491                                if (!upstream_mark(str + at, len - at) &&
 492                                    !push_mark(str + at, len - at)) {
 493                                        reflog_len = (len-1) - (at+2);
 494                                        len = at;
 495                                }
 496                                break;
 497                        }
 498                }
 499        }
 500
 501        /* Accept only unambiguous ref paths. */
 502        if (len && ambiguous_path(str, len))
 503                return -1;
 504
 505        if (nth_prior) {
 506                struct strbuf buf = STRBUF_INIT;
 507                int detached;
 508
 509                if (interpret_nth_prior_checkout(str, len, &buf) > 0) {
 510                        detached = (buf.len == 40 && !get_sha1_hex(buf.buf, sha1));
 511                        strbuf_release(&buf);
 512                        if (detached)
 513                                return 0;
 514                }
 515        }
 516
 517        if (!len && reflog_len)
 518                /* allow "@{...}" to mean the current branch reflog */
 519                refs_found = dwim_ref("HEAD", 4, sha1, &real_ref);
 520        else if (reflog_len)
 521                refs_found = dwim_log(str, len, sha1, &real_ref);
 522        else
 523                refs_found = dwim_ref(str, len, sha1, &real_ref);
 524
 525        if (!refs_found)
 526                return -1;
 527
 528        if (warn_ambiguous_refs && !(flags & GET_SHA1_QUIETLY) &&
 529            (refs_found > 1 ||
 530             !get_short_sha1(str, len, tmp_sha1, GET_SHA1_QUIETLY)))
 531                warning(warn_msg, len, str);
 532
 533        if (reflog_len) {
 534                int nth, i;
 535                unsigned long at_time;
 536                unsigned long co_time;
 537                int co_tz, co_cnt;
 538
 539                /* Is it asking for N-th entry, or approxidate? */
 540                for (i = nth = 0; 0 <= nth && i < reflog_len; i++) {
 541                        char ch = str[at+2+i];
 542                        if ('0' <= ch && ch <= '9')
 543                                nth = nth * 10 + ch - '0';
 544                        else
 545                                nth = -1;
 546                }
 547                if (100000000 <= nth) {
 548                        at_time = nth;
 549                        nth = -1;
 550                } else if (0 <= nth)
 551                        at_time = 0;
 552                else {
 553                        int errors = 0;
 554                        char *tmp = xstrndup(str + at + 2, reflog_len);
 555                        at_time = approxidate_careful(tmp, &errors);
 556                        free(tmp);
 557                        if (errors) {
 558                                free(real_ref);
 559                                return -1;
 560                        }
 561                }
 562                if (read_ref_at(real_ref, flags, at_time, nth, sha1, NULL,
 563                                &co_time, &co_tz, &co_cnt)) {
 564                        if (!len) {
 565                                if (starts_with(real_ref, "refs/heads/")) {
 566                                        str = real_ref + 11;
 567                                        len = strlen(real_ref + 11);
 568                                } else {
 569                                        /* detached HEAD */
 570                                        str = "HEAD";
 571                                        len = 4;
 572                                }
 573                        }
 574                        if (at_time) {
 575                                if (!(flags & GET_SHA1_QUIETLY)) {
 576                                        warning("Log for '%.*s' only goes "
 577                                                "back to %s.", len, str,
 578                                                show_date(co_time, co_tz, DATE_RFC2822));
 579                                }
 580                        } else {
 581                                if (flags & GET_SHA1_QUIETLY) {
 582                                        exit(128);
 583                                }
 584                                die("Log for '%.*s' only has %d entries.",
 585                                    len, str, co_cnt);
 586                        }
 587                }
 588        }
 589
 590        free(real_ref);
 591        return 0;
 592}
 593
 594static int get_parent(const char *name, int len,
 595                      unsigned char *result, int idx)
 596{
 597        unsigned char sha1[20];
 598        int ret = get_sha1_1(name, len, sha1, GET_SHA1_COMMITTISH);
 599        struct commit *commit;
 600        struct commit_list *p;
 601
 602        if (ret)
 603                return ret;
 604        commit = lookup_commit_reference(sha1);
 605        if (parse_commit(commit))
 606                return -1;
 607        if (!idx) {
 608                hashcpy(result, commit->object.sha1);
 609                return 0;
 610        }
 611        p = commit->parents;
 612        while (p) {
 613                if (!--idx) {
 614                        hashcpy(result, p->item->object.sha1);
 615                        return 0;
 616                }
 617                p = p->next;
 618        }
 619        return -1;
 620}
 621
 622static int get_nth_ancestor(const char *name, int len,
 623                            unsigned char *result, int generation)
 624{
 625        unsigned char sha1[20];
 626        struct commit *commit;
 627        int ret;
 628
 629        ret = get_sha1_1(name, len, sha1, GET_SHA1_COMMITTISH);
 630        if (ret)
 631                return ret;
 632        commit = lookup_commit_reference(sha1);
 633        if (!commit)
 634                return -1;
 635
 636        while (generation--) {
 637                if (parse_commit(commit) || !commit->parents)
 638                        return -1;
 639                commit = commit->parents->item;
 640        }
 641        hashcpy(result, commit->object.sha1);
 642        return 0;
 643}
 644
 645struct object *peel_to_type(const char *name, int namelen,
 646                            struct object *o, enum object_type expected_type)
 647{
 648        if (name && !namelen)
 649                namelen = strlen(name);
 650        while (1) {
 651                if (!o || (!o->parsed && !parse_object(o->sha1)))
 652                        return NULL;
 653                if (expected_type == OBJ_ANY || o->type == expected_type)
 654                        return o;
 655                if (o->type == OBJ_TAG)
 656                        o = ((struct tag*) o)->tagged;
 657                else if (o->type == OBJ_COMMIT)
 658                        o = &(((struct commit *) o)->tree->object);
 659                else {
 660                        if (name)
 661                                error("%.*s: expected %s type, but the object "
 662                                      "dereferences to %s type",
 663                                      namelen, name, typename(expected_type),
 664                                      typename(o->type));
 665                        return NULL;
 666                }
 667        }
 668}
 669
 670static int peel_onion(const char *name, int len, unsigned char *sha1)
 671{
 672        unsigned char outer[20];
 673        const char *sp;
 674        unsigned int expected_type = 0;
 675        unsigned lookup_flags = 0;
 676        struct object *o;
 677
 678        /*
 679         * "ref^{type}" dereferences ref repeatedly until you cannot
 680         * dereference anymore, or you get an object of given type,
 681         * whichever comes first.  "ref^{}" means just dereference
 682         * tags until you get a non-tag.  "ref^0" is a shorthand for
 683         * "ref^{commit}".  "commit^{tree}" could be used to find the
 684         * top-level tree of the given commit.
 685         */
 686        if (len < 4 || name[len-1] != '}')
 687                return -1;
 688
 689        for (sp = name + len - 1; name <= sp; sp--) {
 690                int ch = *sp;
 691                if (ch == '{' && name < sp && sp[-1] == '^')
 692                        break;
 693        }
 694        if (sp <= name)
 695                return -1;
 696
 697        sp++; /* beginning of type name, or closing brace for empty */
 698        if (starts_with(sp, "commit}"))
 699                expected_type = OBJ_COMMIT;
 700        else if (starts_with(sp, "tag}"))
 701                expected_type = OBJ_TAG;
 702        else if (starts_with(sp, "tree}"))
 703                expected_type = OBJ_TREE;
 704        else if (starts_with(sp, "blob}"))
 705                expected_type = OBJ_BLOB;
 706        else if (starts_with(sp, "object}"))
 707                expected_type = OBJ_ANY;
 708        else if (sp[0] == '}')
 709                expected_type = OBJ_NONE;
 710        else if (sp[0] == '/')
 711                expected_type = OBJ_COMMIT;
 712        else
 713                return -1;
 714
 715        if (expected_type == OBJ_COMMIT)
 716                lookup_flags = GET_SHA1_COMMITTISH;
 717        else if (expected_type == OBJ_TREE)
 718                lookup_flags = GET_SHA1_TREEISH;
 719
 720        if (get_sha1_1(name, sp - name - 2, outer, lookup_flags))
 721                return -1;
 722
 723        o = parse_object(outer);
 724        if (!o)
 725                return -1;
 726        if (!expected_type) {
 727                o = deref_tag(o, name, sp - name - 2);
 728                if (!o || (!o->parsed && !parse_object(o->sha1)))
 729                        return -1;
 730                hashcpy(sha1, o->sha1);
 731                return 0;
 732        }
 733
 734        /*
 735         * At this point, the syntax look correct, so
 736         * if we do not get the needed object, we should
 737         * barf.
 738         */
 739        o = peel_to_type(name, len, o, expected_type);
 740        if (!o)
 741                return -1;
 742
 743        hashcpy(sha1, o->sha1);
 744        if (sp[0] == '/') {
 745                /* "$commit^{/foo}" */
 746                char *prefix;
 747                int ret;
 748                struct commit_list *list = NULL;
 749
 750                /*
 751                 * $commit^{/}. Some regex implementation may reject.
 752                 * We don't need regex anyway. '' pattern always matches.
 753                 */
 754                if (sp[1] == '}')
 755                        return 0;
 756
 757                prefix = xstrndup(sp + 1, name + len - 1 - (sp + 1));
 758                commit_list_insert((struct commit *)o, &list);
 759                ret = get_sha1_oneline(prefix, sha1, list);
 760                free(prefix);
 761                return ret;
 762        }
 763        return 0;
 764}
 765
 766static int get_describe_name(const char *name, int len, unsigned char *sha1)
 767{
 768        const char *cp;
 769        unsigned flags = GET_SHA1_QUIETLY | GET_SHA1_COMMIT;
 770
 771        for (cp = name + len - 1; name + 2 <= cp; cp--) {
 772                char ch = *cp;
 773                if (!isxdigit(ch)) {
 774                        /* We must be looking at g in "SOMETHING-g"
 775                         * for it to be describe output.
 776                         */
 777                        if (ch == 'g' && cp[-1] == '-') {
 778                                cp++;
 779                                len -= cp - name;
 780                                return get_short_sha1(cp, len, sha1, flags);
 781                        }
 782                }
 783        }
 784        return -1;
 785}
 786
 787static int get_sha1_1(const char *name, int len, unsigned char *sha1, unsigned lookup_flags)
 788{
 789        int ret, has_suffix;
 790        const char *cp;
 791
 792        /*
 793         * "name~3" is "name^^^", "name~" is "name~1", and "name^" is "name^1".
 794         */
 795        has_suffix = 0;
 796        for (cp = name + len - 1; name <= cp; cp--) {
 797                int ch = *cp;
 798                if ('0' <= ch && ch <= '9')
 799                        continue;
 800                if (ch == '~' || ch == '^')
 801                        has_suffix = ch;
 802                break;
 803        }
 804
 805        if (has_suffix) {
 806                int num = 0;
 807                int len1 = cp - name;
 808                cp++;
 809                while (cp < name + len)
 810                        num = num * 10 + *cp++ - '0';
 811                if (!num && len1 == len - 1)
 812                        num = 1;
 813                if (has_suffix == '^')
 814                        return get_parent(name, len1, sha1, num);
 815                /* else if (has_suffix == '~') -- goes without saying */
 816                return get_nth_ancestor(name, len1, sha1, num);
 817        }
 818
 819        ret = peel_onion(name, len, sha1);
 820        if (!ret)
 821                return 0;
 822
 823        ret = get_sha1_basic(name, len, sha1, lookup_flags);
 824        if (!ret)
 825                return 0;
 826
 827        /* It could be describe output that is "SOMETHING-gXXXX" */
 828        ret = get_describe_name(name, len, sha1);
 829        if (!ret)
 830                return 0;
 831
 832        return get_short_sha1(name, len, sha1, lookup_flags);
 833}
 834
 835/*
 836 * This interprets names like ':/Initial revision of "git"' by searching
 837 * through history and returning the first commit whose message starts
 838 * the given regular expression.
 839 *
 840 * For future extension, ':/!' is reserved. If you want to match a message
 841 * beginning with a '!', you have to repeat the exclamation mark.
 842 */
 843
 844/* Remember to update object flag allocation in object.h */
 845#define ONELINE_SEEN (1u<<20)
 846
 847static int handle_one_ref(const char *path,
 848                const unsigned char *sha1, int flag, void *cb_data)
 849{
 850        struct commit_list **list = cb_data;
 851        struct object *object = parse_object(sha1);
 852        if (!object)
 853                return 0;
 854        if (object->type == OBJ_TAG) {
 855                object = deref_tag(object, path, strlen(path));
 856                if (!object)
 857                        return 0;
 858        }
 859        if (object->type != OBJ_COMMIT)
 860                return 0;
 861        commit_list_insert((struct commit *)object, list);
 862        return 0;
 863}
 864
 865static int get_sha1_oneline(const char *prefix, unsigned char *sha1,
 866                            struct commit_list *list)
 867{
 868        struct commit_list *backup = NULL, *l;
 869        int found = 0;
 870        regex_t regex;
 871
 872        if (prefix[0] == '!') {
 873                if (prefix[1] != '!')
 874                        die ("Invalid search pattern: %s", prefix);
 875                prefix++;
 876        }
 877
 878        if (regcomp(&regex, prefix, REG_EXTENDED))
 879                die("Invalid search pattern: %s", prefix);
 880
 881        for (l = list; l; l = l->next) {
 882                l->item->object.flags |= ONELINE_SEEN;
 883                commit_list_insert(l->item, &backup);
 884        }
 885        while (list) {
 886                const char *p, *buf;
 887                struct commit *commit;
 888                int matches;
 889
 890                commit = pop_most_recent_commit(&list, ONELINE_SEEN);
 891                if (!parse_object(commit->object.sha1))
 892                        continue;
 893                buf = get_commit_buffer(commit, NULL);
 894                p = strstr(buf, "\n\n");
 895                matches = p && !regexec(&regex, p + 2, 0, NULL, 0);
 896                unuse_commit_buffer(commit, buf);
 897
 898                if (matches) {
 899                        hashcpy(sha1, commit->object.sha1);
 900                        found = 1;
 901                        break;
 902                }
 903        }
 904        regfree(&regex);
 905        free_commit_list(list);
 906        for (l = backup; l; l = l->next)
 907                clear_commit_marks(l->item, ONELINE_SEEN);
 908        free_commit_list(backup);
 909        return found ? 0 : -1;
 910}
 911
 912struct grab_nth_branch_switch_cbdata {
 913        int remaining;
 914        struct strbuf buf;
 915};
 916
 917static int grab_nth_branch_switch(unsigned char *osha1, unsigned char *nsha1,
 918                                  const char *email, unsigned long timestamp, int tz,
 919                                  const char *message, void *cb_data)
 920{
 921        struct grab_nth_branch_switch_cbdata *cb = cb_data;
 922        const char *match = NULL, *target = NULL;
 923        size_t len;
 924
 925        if (skip_prefix(message, "checkout: moving from ", &match))
 926                target = strstr(match, " to ");
 927
 928        if (!match || !target)
 929                return 0;
 930        if (--(cb->remaining) == 0) {
 931                len = target - match;
 932                strbuf_reset(&cb->buf);
 933                strbuf_add(&cb->buf, match, len);
 934                return 1; /* we are done */
 935        }
 936        return 0;
 937}
 938
 939/*
 940 * Parse @{-N} syntax, return the number of characters parsed
 941 * if successful; otherwise signal an error with negative value.
 942 */
 943static int interpret_nth_prior_checkout(const char *name, int namelen,
 944                                        struct strbuf *buf)
 945{
 946        long nth;
 947        int retval;
 948        struct grab_nth_branch_switch_cbdata cb;
 949        const char *brace;
 950        char *num_end;
 951
 952        if (namelen < 4)
 953                return -1;
 954        if (name[0] != '@' || name[1] != '{' || name[2] != '-')
 955                return -1;
 956        brace = memchr(name, '}', namelen);
 957        if (!brace)
 958                return -1;
 959        nth = strtol(name + 3, &num_end, 10);
 960        if (num_end != brace)
 961                return -1;
 962        if (nth <= 0)
 963                return -1;
 964        cb.remaining = nth;
 965        strbuf_init(&cb.buf, 20);
 966
 967        retval = 0;
 968        if (0 < for_each_reflog_ent_reverse("HEAD", grab_nth_branch_switch, &cb)) {
 969                strbuf_reset(buf);
 970                strbuf_addbuf(buf, &cb.buf);
 971                retval = brace - name + 1;
 972        }
 973
 974        strbuf_release(&cb.buf);
 975        return retval;
 976}
 977
 978int get_sha1_mb(const char *name, unsigned char *sha1)
 979{
 980        struct commit *one, *two;
 981        struct commit_list *mbs;
 982        unsigned char sha1_tmp[20];
 983        const char *dots;
 984        int st;
 985
 986        dots = strstr(name, "...");
 987        if (!dots)
 988                return get_sha1(name, sha1);
 989        if (dots == name)
 990                st = get_sha1("HEAD", sha1_tmp);
 991        else {
 992                struct strbuf sb;
 993                strbuf_init(&sb, dots - name);
 994                strbuf_add(&sb, name, dots - name);
 995                st = get_sha1_committish(sb.buf, sha1_tmp);
 996                strbuf_release(&sb);
 997        }
 998        if (st)
 999                return st;
1000        one = lookup_commit_reference_gently(sha1_tmp, 0);
1001        if (!one)
1002                return -1;
1003
1004        if (get_sha1_committish(dots[3] ? (dots + 3) : "HEAD", sha1_tmp))
1005                return -1;
1006        two = lookup_commit_reference_gently(sha1_tmp, 0);
1007        if (!two)
1008                return -1;
1009        mbs = get_merge_bases(one, two);
1010        if (!mbs || mbs->next)
1011                st = -1;
1012        else {
1013                st = 0;
1014                hashcpy(sha1, mbs->item->object.sha1);
1015        }
1016        free_commit_list(mbs);
1017        return st;
1018}
1019
1020/* parse @something syntax, when 'something' is not {.*} */
1021static int interpret_empty_at(const char *name, int namelen, int len, struct strbuf *buf)
1022{
1023        const char *next;
1024
1025        if (len || name[1] == '{')
1026                return -1;
1027
1028        /* make sure it's a single @, or @@{.*}, not @foo */
1029        next = memchr(name + len + 1, '@', namelen - len - 1);
1030        if (next && next[1] != '{')
1031                return -1;
1032        if (!next)
1033                next = name + namelen;
1034        if (next != name + 1)
1035                return -1;
1036
1037        strbuf_reset(buf);
1038        strbuf_add(buf, "HEAD", 4);
1039        return 1;
1040}
1041
1042static int reinterpret(const char *name, int namelen, int len, struct strbuf *buf)
1043{
1044        /* we have extra data, which might need further processing */
1045        struct strbuf tmp = STRBUF_INIT;
1046        int used = buf->len;
1047        int ret;
1048
1049        strbuf_add(buf, name + len, namelen - len);
1050        ret = interpret_branch_name(buf->buf, buf->len, &tmp);
1051        /* that data was not interpreted, remove our cruft */
1052        if (ret < 0) {
1053                strbuf_setlen(buf, used);
1054                return len;
1055        }
1056        strbuf_reset(buf);
1057        strbuf_addbuf(buf, &tmp);
1058        strbuf_release(&tmp);
1059        /* tweak for size of {-N} versus expanded ref name */
1060        return ret - used + len;
1061}
1062
1063static void set_shortened_ref(struct strbuf *buf, const char *ref)
1064{
1065        char *s = shorten_unambiguous_ref(ref, 0);
1066        strbuf_reset(buf);
1067        strbuf_addstr(buf, s);
1068        free(s);
1069}
1070
1071static int interpret_branch_mark(const char *name, int namelen,
1072                                 int at, struct strbuf *buf,
1073                                 int (*get_mark)(const char *, int),
1074                                 const char *(*get_data)(struct branch *,
1075                                                         struct strbuf *))
1076{
1077        int len;
1078        struct branch *branch;
1079        struct strbuf err = STRBUF_INIT;
1080        const char *value;
1081
1082        len = get_mark(name + at, namelen - at);
1083        if (!len)
1084                return -1;
1085
1086        if (memchr(name, ':', at))
1087                return -1;
1088
1089        if (at) {
1090                char *name_str = xmemdupz(name, at);
1091                branch = branch_get(name_str);
1092                free(name_str);
1093        } else
1094                branch = branch_get(NULL);
1095
1096        value = get_data(branch, &err);
1097        if (!value)
1098                die("%s", err.buf);
1099
1100        set_shortened_ref(buf, value);
1101        return len + at;
1102}
1103
1104/*
1105 * This reads short-hand syntax that not only evaluates to a commit
1106 * object name, but also can act as if the end user spelled the name
1107 * of the branch from the command line.
1108 *
1109 * - "@{-N}" finds the name of the Nth previous branch we were on, and
1110 *   places the name of the branch in the given buf and returns the
1111 *   number of characters parsed if successful.
1112 *
1113 * - "<branch>@{upstream}" finds the name of the other ref that
1114 *   <branch> is configured to merge with (missing <branch> defaults
1115 *   to the current branch), and places the name of the branch in the
1116 *   given buf and returns the number of characters parsed if
1117 *   successful.
1118 *
1119 * If the input is not of the accepted format, it returns a negative
1120 * number to signal an error.
1121 *
1122 * If the input was ok but there are not N branch switches in the
1123 * reflog, it returns 0.
1124 */
1125int interpret_branch_name(const char *name, int namelen, struct strbuf *buf)
1126{
1127        char *at;
1128        const char *start;
1129        int len = interpret_nth_prior_checkout(name, namelen, buf);
1130
1131        if (!namelen)
1132                namelen = strlen(name);
1133
1134        if (!len) {
1135                return len; /* syntax Ok, not enough switches */
1136        } else if (len > 0) {
1137                if (len == namelen)
1138                        return len; /* consumed all */
1139                else
1140                        return reinterpret(name, namelen, len, buf);
1141        }
1142
1143        for (start = name;
1144             (at = memchr(start, '@', namelen - (start - name)));
1145             start = at + 1) {
1146
1147                len = interpret_empty_at(name, namelen, at - name, buf);
1148                if (len > 0)
1149                        return reinterpret(name, namelen, len, buf);
1150
1151                len = interpret_branch_mark(name, namelen, at - name, buf,
1152                                            upstream_mark, branch_get_upstream);
1153                if (len > 0)
1154                        return len;
1155
1156                len = interpret_branch_mark(name, namelen, at - name, buf,
1157                                            push_mark, branch_get_push);
1158                if (len > 0)
1159                        return len;
1160        }
1161
1162        return -1;
1163}
1164
1165int strbuf_branchname(struct strbuf *sb, const char *name)
1166{
1167        int len = strlen(name);
1168        int used = interpret_branch_name(name, len, sb);
1169
1170        if (used == len)
1171                return 0;
1172        if (used < 0)
1173                used = 0;
1174        strbuf_add(sb, name + used, len - used);
1175        return len;
1176}
1177
1178int strbuf_check_branch_ref(struct strbuf *sb, const char *name)
1179{
1180        strbuf_branchname(sb, name);
1181        if (name[0] == '-')
1182                return -1;
1183        strbuf_splice(sb, 0, 0, "refs/heads/", 11);
1184        return check_refname_format(sb->buf, 0);
1185}
1186
1187/*
1188 * This is like "get_sha1_basic()", except it allows "sha1 expressions",
1189 * notably "xyz^" for "parent of xyz"
1190 */
1191int get_sha1(const char *name, unsigned char *sha1)
1192{
1193        struct object_context unused;
1194        return get_sha1_with_context(name, 0, sha1, &unused);
1195}
1196
1197/*
1198 * Many callers know that the user meant to name a commit-ish by
1199 * syntactical positions where the object name appears.  Calling this
1200 * function allows the machinery to disambiguate shorter-than-unique
1201 * abbreviated object names between commit-ish and others.
1202 *
1203 * Note that this does NOT error out when the named object is not a
1204 * commit-ish. It is merely to give a hint to the disambiguation
1205 * machinery.
1206 */
1207int get_sha1_committish(const char *name, unsigned char *sha1)
1208{
1209        struct object_context unused;
1210        return get_sha1_with_context(name, GET_SHA1_COMMITTISH,
1211                                     sha1, &unused);
1212}
1213
1214int get_sha1_treeish(const char *name, unsigned char *sha1)
1215{
1216        struct object_context unused;
1217        return get_sha1_with_context(name, GET_SHA1_TREEISH,
1218                                     sha1, &unused);
1219}
1220
1221int get_sha1_commit(const char *name, unsigned char *sha1)
1222{
1223        struct object_context unused;
1224        return get_sha1_with_context(name, GET_SHA1_COMMIT,
1225                                     sha1, &unused);
1226}
1227
1228int get_sha1_tree(const char *name, unsigned char *sha1)
1229{
1230        struct object_context unused;
1231        return get_sha1_with_context(name, GET_SHA1_TREE,
1232                                     sha1, &unused);
1233}
1234
1235int get_sha1_blob(const char *name, unsigned char *sha1)
1236{
1237        struct object_context unused;
1238        return get_sha1_with_context(name, GET_SHA1_BLOB,
1239                                     sha1, &unused);
1240}
1241
1242/* Must be called only when object_name:filename doesn't exist. */
1243static void diagnose_invalid_sha1_path(const char *prefix,
1244                                       const char *filename,
1245                                       const unsigned char *tree_sha1,
1246                                       const char *object_name,
1247                                       int object_name_len)
1248{
1249        struct stat st;
1250        unsigned char sha1[20];
1251        unsigned mode;
1252
1253        if (!prefix)
1254                prefix = "";
1255
1256        if (!lstat(filename, &st))
1257                die("Path '%s' exists on disk, but not in '%.*s'.",
1258                    filename, object_name_len, object_name);
1259        if (errno == ENOENT || errno == ENOTDIR) {
1260                char *fullname = xstrfmt("%s%s", prefix, filename);
1261
1262                if (!get_tree_entry(tree_sha1, fullname,
1263                                    sha1, &mode)) {
1264                        die("Path '%s' exists, but not '%s'.\n"
1265                            "Did you mean '%.*s:%s' aka '%.*s:./%s'?",
1266                            fullname,
1267                            filename,
1268                            object_name_len, object_name,
1269                            fullname,
1270                            object_name_len, object_name,
1271                            filename);
1272                }
1273                die("Path '%s' does not exist in '%.*s'",
1274                    filename, object_name_len, object_name);
1275        }
1276}
1277
1278/* Must be called only when :stage:filename doesn't exist. */
1279static void diagnose_invalid_index_path(int stage,
1280                                        const char *prefix,
1281                                        const char *filename)
1282{
1283        struct stat st;
1284        const struct cache_entry *ce;
1285        int pos;
1286        unsigned namelen = strlen(filename);
1287        unsigned fullnamelen;
1288        char *fullname;
1289
1290        if (!prefix)
1291                prefix = "";
1292
1293        /* Wrong stage number? */
1294        pos = cache_name_pos(filename, namelen);
1295        if (pos < 0)
1296                pos = -pos - 1;
1297        if (pos < active_nr) {
1298                ce = active_cache[pos];
1299                if (ce_namelen(ce) == namelen &&
1300                    !memcmp(ce->name, filename, namelen))
1301                        die("Path '%s' is in the index, but not at stage %d.\n"
1302                            "Did you mean ':%d:%s'?",
1303                            filename, stage,
1304                            ce_stage(ce), filename);
1305        }
1306
1307        /* Confusion between relative and absolute filenames? */
1308        fullnamelen = namelen + strlen(prefix);
1309        fullname = xmalloc(fullnamelen + 1);
1310        strcpy(fullname, prefix);
1311        strcat(fullname, filename);
1312        pos = cache_name_pos(fullname, fullnamelen);
1313        if (pos < 0)
1314                pos = -pos - 1;
1315        if (pos < active_nr) {
1316                ce = active_cache[pos];
1317                if (ce_namelen(ce) == fullnamelen &&
1318                    !memcmp(ce->name, fullname, fullnamelen))
1319                        die("Path '%s' is in the index, but not '%s'.\n"
1320                            "Did you mean ':%d:%s' aka ':%d:./%s'?",
1321                            fullname, filename,
1322                            ce_stage(ce), fullname,
1323                            ce_stage(ce), filename);
1324        }
1325
1326        if (!lstat(filename, &st))
1327                die("Path '%s' exists on disk, but not in the index.", filename);
1328        if (errno == ENOENT || errno == ENOTDIR)
1329                die("Path '%s' does not exist (neither on disk nor in the index).",
1330                    filename);
1331
1332        free(fullname);
1333}
1334
1335
1336static char *resolve_relative_path(const char *rel)
1337{
1338        if (!starts_with(rel, "./") && !starts_with(rel, "../"))
1339                return NULL;
1340
1341        if (!startup_info)
1342                die("BUG: startup_info struct is not initialized.");
1343
1344        if (!is_inside_work_tree())
1345                die("relative path syntax can't be used outside working tree.");
1346
1347        /* die() inside prefix_path() if resolved path is outside worktree */
1348        return prefix_path(startup_info->prefix,
1349                           startup_info->prefix ? strlen(startup_info->prefix) : 0,
1350                           rel);
1351}
1352
1353static int get_sha1_with_context_1(const char *name,
1354                                   unsigned flags,
1355                                   const char *prefix,
1356                                   unsigned char *sha1,
1357                                   struct object_context *oc)
1358{
1359        int ret, bracket_depth;
1360        int namelen = strlen(name);
1361        const char *cp;
1362        int only_to_die = flags & GET_SHA1_ONLY_TO_DIE;
1363
1364        memset(oc, 0, sizeof(*oc));
1365        oc->mode = S_IFINVALID;
1366        ret = get_sha1_1(name, namelen, sha1, flags);
1367        if (!ret)
1368                return ret;
1369        /*
1370         * sha1:path --> object name of path in ent sha1
1371         * :path -> object name of absolute path in index
1372         * :./path -> object name of path relative to cwd in index
1373         * :[0-3]:path -> object name of path in index at stage
1374         * :/foo -> recent commit matching foo
1375         */
1376        if (name[0] == ':') {
1377                int stage = 0;
1378                const struct cache_entry *ce;
1379                char *new_path = NULL;
1380                int pos;
1381                if (!only_to_die && namelen > 2 && name[1] == '/') {
1382                        struct commit_list *list = NULL;
1383                        for_each_ref(handle_one_ref, &list);
1384                        commit_list_sort_by_date(&list);
1385                        return get_sha1_oneline(name + 2, sha1, list);
1386                }
1387                if (namelen < 3 ||
1388                    name[2] != ':' ||
1389                    name[1] < '0' || '3' < name[1])
1390                        cp = name + 1;
1391                else {
1392                        stage = name[1] - '0';
1393                        cp = name + 3;
1394                }
1395                new_path = resolve_relative_path(cp);
1396                if (!new_path) {
1397                        namelen = namelen - (cp - name);
1398                } else {
1399                        cp = new_path;
1400                        namelen = strlen(cp);
1401                }
1402
1403                strlcpy(oc->path, cp, sizeof(oc->path));
1404
1405                if (!active_cache)
1406                        read_cache();
1407                pos = cache_name_pos(cp, namelen);
1408                if (pos < 0)
1409                        pos = -pos - 1;
1410                while (pos < active_nr) {
1411                        ce = active_cache[pos];
1412                        if (ce_namelen(ce) != namelen ||
1413                            memcmp(ce->name, cp, namelen))
1414                                break;
1415                        if (ce_stage(ce) == stage) {
1416                                hashcpy(sha1, ce->sha1);
1417                                oc->mode = ce->ce_mode;
1418                                free(new_path);
1419                                return 0;
1420                        }
1421                        pos++;
1422                }
1423                if (only_to_die && name[1] && name[1] != '/')
1424                        diagnose_invalid_index_path(stage, prefix, cp);
1425                free(new_path);
1426                return -1;
1427        }
1428        for (cp = name, bracket_depth = 0; *cp; cp++) {
1429                if (*cp == '{')
1430                        bracket_depth++;
1431                else if (bracket_depth && *cp == '}')
1432                        bracket_depth--;
1433                else if (!bracket_depth && *cp == ':')
1434                        break;
1435        }
1436        if (*cp == ':') {
1437                unsigned char tree_sha1[20];
1438                int len = cp - name;
1439                if (!get_sha1_1(name, len, tree_sha1, GET_SHA1_TREEISH)) {
1440                        const char *filename = cp+1;
1441                        char *new_filename = NULL;
1442
1443                        new_filename = resolve_relative_path(filename);
1444                        if (new_filename)
1445                                filename = new_filename;
1446                        ret = get_tree_entry(tree_sha1, filename, sha1, &oc->mode);
1447                        if (ret && only_to_die) {
1448                                diagnose_invalid_sha1_path(prefix, filename,
1449                                                           tree_sha1,
1450                                                           name, len);
1451                        }
1452                        hashcpy(oc->tree, tree_sha1);
1453                        strlcpy(oc->path, filename, sizeof(oc->path));
1454
1455                        free(new_filename);
1456                        return ret;
1457                } else {
1458                        if (only_to_die)
1459                                die("Invalid object name '%.*s'.", len, name);
1460                }
1461        }
1462        return ret;
1463}
1464
1465/*
1466 * Call this function when you know "name" given by the end user must
1467 * name an object but it doesn't; the function _may_ die with a better
1468 * diagnostic message than "no such object 'name'", e.g. "Path 'doc' does not
1469 * exist in 'HEAD'" when given "HEAD:doc", or it may return in which case
1470 * you have a chance to diagnose the error further.
1471 */
1472void maybe_die_on_misspelt_object_name(const char *name, const char *prefix)
1473{
1474        struct object_context oc;
1475        unsigned char sha1[20];
1476        get_sha1_with_context_1(name, GET_SHA1_ONLY_TO_DIE, prefix, sha1, &oc);
1477}
1478
1479int get_sha1_with_context(const char *str, unsigned flags, unsigned char *sha1, struct object_context *orc)
1480{
1481        return get_sha1_with_context_1(str, flags, NULL, sha1, orc);
1482}