git.oblomov.eu Git - git/blob - sha1_name.c

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