revparse.c 23.1 KB
Newer Older
1 2 3 4 5 6 7 8 9 10 11
/*
 * Copyright (C) 2009-2012 the libgit2 contributors
 *
 * This file is part of libgit2, distributed under the GNU GPL v2 with
 * a Linking Exception. For full terms see the included COPYING file.
 */

#include <assert.h>

#include "common.h"
#include "buffer.h"
12
#include "tree.h"
13

Ben Straub committed
14
#include "git2.h"
15 16 17

typedef enum {
   REVPARSE_STATE_INIT,
18 19
   REVPARSE_STATE_CARET,
   REVPARSE_STATE_LINEAR,
20
   REVPARSE_STATE_COLON,
21
   REVPARSE_STATE_DONE,
22 23
} revparse_state;

24 25 26 27 28
static void set_invalid_syntax_err(const char *spec)
{
   giterr_set(GITERR_INVALID, "Refspec '%s' is not valid.", spec);
}

29 30
static int revparse_lookup_fully_qualifed_ref(git_object **out, git_repository *repo, const char*spec)
{
31
   git_oid resolved;
32

33 34
   if (git_reference_name_to_oid(&resolved, repo, spec) < 0)
      return GIT_ERROR;
35

36
   return git_object_lookup(out, repo, &resolved, GIT_OBJ_ANY);
37 38
}

39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54
/* Returns non-zero if yes */
static int spec_looks_like_describe_output(const char *spec)
{
   regex_t regex;
   int regex_error, retcode;

   regex_error = regcomp(&regex, ".+-[0-9]+-g[0-9a-fA-F]+", REG_EXTENDED);
   if (regex_error != 0) {
      giterr_set_regex(&regex, regex_error);
      return 1; /* To be safe */
   }
   retcode = regexec(&regex, spec, 0, NULL, 0);
   regfree(&regex);
   return retcode == 0;
}

55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73
static int revparse_lookup_object(git_object **out, git_repository *repo, const char *spec)
{
   size_t speclen = strlen(spec);
   git_object *obj = NULL;
   git_oid oid;
   git_buf refnamebuf = GIT_BUF_INIT;
   static const char* formatters[] = {
      "refs/%s",
      "refs/tags/%s",
      "refs/heads/%s",
      "refs/remotes/%s",
      "refs/remotes/%s/HEAD",
      NULL
   };
   unsigned int i;
   const char *substr;

   /* "git describe" output; snip everything before/including "-g" */
   substr = strstr(spec, "-g");
74
   if (substr &&
75
       spec_looks_like_describe_output(spec) &&
76 77
       !revparse_lookup_object(out, repo, substr+2)) {
      return 0;
78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113
   }

   /* SHA or prefix */
   if (!git_oid_fromstrn(&oid, spec, speclen)) {
      if (!git_object_lookup_prefix(&obj, repo, &oid, speclen, GIT_OBJ_ANY)) {
         *out = obj;
         return 0;
      }
   }

   /* Fully-named ref */
   if (!revparse_lookup_fully_qualifed_ref(&obj, repo, spec)) {
      *out = obj;
      return 0;
   }

   /* Partially-named ref; match in this order: */
   for (i=0; formatters[i]; i++) {
      git_buf_clear(&refnamebuf);
      if (git_buf_printf(&refnamebuf, formatters[i], spec) < 0) {
         return GIT_ERROR;
      }

      if (!revparse_lookup_fully_qualifed_ref(&obj, repo, git_buf_cstr(&refnamebuf))) {
         git_buf_free(&refnamebuf);
         *out = obj;
         return 0;
      }
   }
   git_buf_free(&refnamebuf);

   giterr_set(GITERR_REFERENCE, "Refspec '%s' not found.", spec);
   return GIT_ERROR;
}


Ben Straub committed
114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143
static int all_chars_are_digits(const char *str, size_t len)
{
   size_t i=0;
   for (i=0; i<len; i++) {
      if (str[i] < '0' || str[i] > '9') return 0;
   }
   return 1;
}

static void normalize_maybe_empty_refname(git_buf *buf, git_repository *repo, const char *refspec, size_t refspeclen)
{
   git_reference *ref;

   if (!refspeclen) {
      /* Empty refspec means current branch (target of HEAD) */
      git_reference_lookup(&ref, repo, "HEAD");
      git_buf_puts(buf, git_reference_target(ref));
      git_reference_free(ref);
   } else if (strstr(refspec, "HEAD")) {
      /* Explicit head */
      git_buf_puts(buf, refspec);
   }else {
      if (git__prefixcmp(refspec, "refs/heads/") != 0) {
         git_buf_printf(buf, "refs/heads/%s", refspec);
      } else {
         git_buf_puts(buf, refspec);
      }
   }
}

144
static int walk_ref_history(git_object **out, git_repository *repo, const char *refspec, const char *reflogspec)
145
{
146 147 148
   git_reference *ref;
   git_reflog *reflog = NULL;
   int n, retcode = GIT_ERROR;
149
   int i, refloglen;
150 151
   const git_reflog_entry *entry;
   git_buf buf = GIT_BUF_INIT;
152
   size_t refspeclen = strlen(refspec);
Ben Straub committed
153
   size_t reflogspeclen = strlen(reflogspec);
154 155 156 157 158 159

   if (git__prefixcmp(reflogspec, "@{") != 0 ||
       git__suffixcmp(reflogspec, "}") != 0) {
      giterr_set(GITERR_INVALID, "Bad reflogspec '%s'", reflogspec);
      return GIT_ERROR;
   }
160

161
   /* "@{-N}" form means walk back N checkouts. That means the HEAD log. */
162
   if (refspeclen == 0 && !git__prefixcmp(reflogspec, "@{-")) {
163
      regex_t regex;
164
      int regex_error;
165

166 167 168 169 170
      if (git__strtol32(&n, reflogspec+3, NULL, 0) < 0 ||
          n < 1) {
         giterr_set(GITERR_INVALID, "Invalid reflogspec %s", reflogspec);
         return GIT_ERROR;
      }
171

172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193
      if (!git_reference_lookup(&ref, repo, "HEAD")) {
         if (!git_reflog_read(&reflog, ref)) {
            regex_error = regcomp(&regex, "checkout: moving from (.*) to .*", REG_EXTENDED);
            if (regex_error != 0) {
               giterr_set_regex(&regex, regex_error);
            } else {
               regmatch_t regexmatches[2];

               refloglen = git_reflog_entrycount(reflog);
               for (i=refloglen-1; i >= 0; i--) {
                  const char *msg;
                  entry = git_reflog_entry_byindex(reflog, i);

                  msg = git_reflog_entry_msg(entry);
                  if (!regexec(&regex, msg, 2, regexmatches, 0)) {
                     n--;
                     if (!n) {
                        git_buf_put(&buf, msg+regexmatches[1].rm_so, regexmatches[1].rm_eo - regexmatches[1].rm_so);
                        retcode = revparse_lookup_object(out, repo, git_buf_cstr(&buf));
                        break;
                     }
                  }
194
               }
195
               regfree(&regex);
196 197
            }
         }
198
         git_reference_free(ref);
199 200
      }
   } else {
Ben Straub committed
201
      int date_error = 0;
202
      git_time_t timestamp;
Ben Straub committed
203
      git_buf datebuf = GIT_BUF_INIT;
Ben Straub committed
204

Ben Straub committed
205
      git_buf_put(&datebuf, reflogspec+2, reflogspeclen-3);
206
      date_error = git__date_parse(&timestamp, git_buf_cstr(&datebuf));
207 208 209

      /* @{u} or @{upstream} -> upstream branch, for a tracking branch. This is stored in the config. */
      if (!strcmp(reflogspec, "@{u}") || !strcmp(reflogspec, "@{upstream}")) {
210 211 212 213 214 215
         git_config *cfg;
         if (!git_repository_config(&cfg, repo)) {
            /* Is the ref a tracking branch? */
            const char *remote;
            git_buf_clear(&buf);
            git_buf_printf(&buf, "branch.%s.remote", refspec);
216
            if (!git_config_get_string(&remote, cfg, git_buf_cstr(&buf))) {
217 218 219 220
               /* Yes. Find the first merge target name. */
               const char *mergetarget;
               git_buf_clear(&buf);
               git_buf_printf(&buf, "branch.%s.merge", refspec);
221
               if (!git_config_get_string(&mergetarget, cfg, git_buf_cstr(&buf)) &&
222 223 224 225 226 227 228 229 230
                   !git__prefixcmp(mergetarget, "refs/heads/")) {
                  /* Success. Look up the target and fetch the object. */
                  git_buf_clear(&buf);
                  git_buf_printf(&buf, "refs/remotes/%s/%s", remote, mergetarget+11);
                  retcode = revparse_lookup_fully_qualifed_ref(out, repo, git_buf_cstr(&buf));
               }
            }
            git_config_free(cfg);
         }
231 232 233
      }

      /* @{N} -> Nth prior value for the ref (from reflog) */
Ben Straub committed
234 235 236 237 238
      else if (all_chars_are_digits(reflogspec+2, reflogspeclen-3) &&
               !git__strtol32(&n, reflogspec+2, NULL, 0) &&
               n <= 100000000) { /* Allow integer time */
         normalize_maybe_empty_refname(&buf, repo, refspec, refspeclen);

239 240 241 242
         if (n == 0) {
            retcode = revparse_lookup_fully_qualifed_ref(out, repo, git_buf_cstr(&buf));
         } else if (!git_reference_lookup(&ref, repo, git_buf_cstr(&buf))) {
            if (!git_reflog_read(&reflog, ref)) {
Ben Straub committed
243 244 245 246 247 248 249 250 251 252
               int numentries = git_reflog_entrycount(reflog);
               if (numentries < n) {
                  giterr_set(GITERR_REFERENCE, "Reflog for '%s' has only %d entries, asked for %d",
                             git_buf_cstr(&buf), numentries, n);
                  retcode = GIT_ERROR;
               } else {
                  const git_reflog_entry *entry = git_reflog_entry_byindex(reflog, n);
                  const git_oid *oid = git_reflog_entry_oidold(entry);
                  retcode = git_object_lookup(out, repo, oid, GIT_OBJ_ANY);
               }
253 254 255 256 257
            }
            git_reference_free(ref);
         }
      }

Ben Straub committed
258 259 260 261 262 263 264 265 266 267 268 269 270
      else if (!date_error) {
         /* Ref as it was on a certain date */
         normalize_maybe_empty_refname(&buf, repo, refspec, refspeclen);

         if (!git_reference_lookup(&ref, repo, git_buf_cstr(&buf))) {
            git_reflog *reflog;
            if (!git_reflog_read(&reflog, ref)) {
               /* Keep walking until we find an entry older than the given date */
               int numentries = git_reflog_entrycount(reflog);
               int i;

               /* TODO: clunky. Factor "now" into a utility */
               git_signature *sig;
Ben Straub committed
271 272
               git_time as_of;

Ben Straub committed
273
               git_signature_now(&sig, "blah", "blah");
Ben Straub committed
274
               as_of = sig->when;
Ben Straub committed
275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294
               git_signature_free(sig);

               as_of.time = (timestamp > 0)
                  ? timestamp
                  : sig->when.time + timestamp;

               for (i=numentries-1; i>0; i--) {
                  const git_reflog_entry *entry = git_reflog_entry_byindex(reflog, i);
                  git_time commit_time = git_reflog_entry_committer(entry)->when;
                  if (git__time_cmp(&commit_time, &as_of) <= 0 ) {
                     retcode = git_object_lookup(out, repo, git_reflog_entry_oidnew(entry), GIT_OBJ_ANY);
                     break;
                  }
               }

               if (!i) {
                  /* Didn't find a match. Use the oldest revision in the reflog. */
                  const git_reflog_entry *entry = git_reflog_entry_byindex(reflog, 0);
                  retcode = git_object_lookup(out, repo, git_reflog_entry_oidnew(entry), GIT_OBJ_ANY);
               }
Ben Straub committed
295 296

               git_reflog_free(reflog);
Ben Straub committed
297 298 299 300
            }

            git_reference_free(ref);
         }
301
      }
Ben Straub committed
302 303

      git_buf_free(&datebuf);
304 305 306 307 308
   }

   if (reflog) git_reflog_free(reflog);
   git_buf_free(&buf);
   return retcode;
309 310 311 312 313 314 315 316
}

static git_object* dereference_object(git_object *obj)
{
   git_otype type = git_object_type(obj);

   switch (type) {
   case GIT_OBJ_COMMIT:
317 318 319 320 321
      {
         git_tree *tree = NULL;
         if (0 == git_commit_tree(&tree, (git_commit*)obj)) {
            return (git_object*)tree;
         }
322
      }
323 324
      break;
   case GIT_OBJ_TAG:
325 326 327 328 329
      {
            git_object *newobj = NULL;
            if (0 == git_tag_target(&newobj, (git_tag*)obj)) {
               return newobj;
            }
330
      }
331
      break;
332 333

   default:
334 335 336 337
   case GIT_OBJ_TREE:
   case GIT_OBJ_BLOB:
   case GIT_OBJ_OFS_DELTA:
   case GIT_OBJ_REF_DELTA:
338 339 340 341 342 343
      break;
   }

   /* Can't dereference some types */
   return NULL;
}
344 345 346

static int dereference_to_type(git_object **out, git_object *obj, git_otype target_type)
{
347
   int retcode = 1;
348
   git_object *obj1 = obj, *obj2 = obj;
349

350
   while (retcode > 0) {
351 352
      git_otype this_type = git_object_type(obj1);

353
      if (this_type == target_type) {
354
         *out = obj1;
355 356 357 358 359 360 361 362
         retcode = 0;
      } else {
         /* Dereference once, if possible. */
         obj2 = dereference_object(obj1);
         if (!obj2) {
            giterr_set(GITERR_REFERENCE, "Can't dereference to type");
            retcode = GIT_ERROR;
         }
363
      }
364
      if (obj1 != obj && obj1 != obj2) {
365
         git_object_free(obj1);
366 367
      }
      obj1 = obj2;
368
   }
369
   return retcode;
370 371
}

372 373 374 375 376 377 378 379 380
static git_otype parse_obj_type(const char *str)
{
   if (!strcmp(str, "{commit}")) return GIT_OBJ_COMMIT;
   if (!strcmp(str, "{tree}")) return GIT_OBJ_TREE;
   if (!strcmp(str, "{blob}")) return GIT_OBJ_BLOB;
   if (!strcmp(str, "{tag}")) return GIT_OBJ_TAG;
   return GIT_OBJ_BAD;
}

381
static int handle_caret_syntax(git_object **out, git_repository *repo, git_object *obj, const char *movement)
382
{
383
   git_commit *commit;
384
   size_t movementlen = strlen(movement);
385
   int n;
386 387

   if (*movement == '{') {
388
      if (movement[movementlen-1] != '}') {
389 390 391
         set_invalid_syntax_err(movement);
         return GIT_ERROR;
      }
392 393

      /* {} -> Dereference until we reach an object that isn't a tag. */
394
      if (movementlen == 2) {
395 396 397 398 399 400 401 402 403
         git_object *newobj = obj;
         git_object *newobj2 = newobj;
         while (git_object_type(newobj2) == GIT_OBJ_TAG) {
            newobj2 = dereference_object(newobj);
            if (newobj != obj) git_object_free(newobj);
            if (!newobj2) {
               giterr_set(GITERR_REFERENCE, "Couldn't find object of target type.");
               return GIT_ERROR;
            }
404
            newobj = newobj2;
405 406 407 408
         }
         *out = newobj2;
         return 0;
      }
409 410
      
      /* {/...} -> Walk all commits until we see a commit msg that matches the phrase. */
411
      if (movement[1] == '/') {
412 413 414 415 416
         int retcode = GIT_ERROR;
         git_revwalk *walk;
         if (!git_revwalk_new(&walk, repo)) {
            git_oid oid;
            regex_t preg;
417
            int reg_error;
418 419 420 421 422 423 424 425
            git_buf buf = GIT_BUF_INIT;

            git_revwalk_sorting(walk, GIT_SORT_TIME);
            git_revwalk_push(walk, git_object_id(obj));

            /* Extract the regex from the movement string */
            git_buf_put(&buf, movement+2, strlen(movement)-3);

426 427 428 429
            reg_error = regcomp(&preg, git_buf_cstr(&buf), REG_EXTENDED);
            if (reg_error != 0) {
               giterr_set_regex(&preg, reg_error);
            } else {
430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447
               while(!git_revwalk_next(&oid, walk)) {
                  git_object *walkobj;

                  /* Fetch the commit object, and check for matches in the message */
                  if (!git_object_lookup(&walkobj, repo, &oid, GIT_OBJ_COMMIT)) {
                     if (!regexec(&preg, git_commit_message((git_commit*)walkobj), 0, NULL, 0)) {
                        /* Found it! */
                        retcode = 0;
                        *out = walkobj;
                        if (obj == walkobj) {
                           /* Avoid leaking an object */
                           git_object_free(walkobj);
                        }
                        break;
                     }
                     git_object_free(walkobj);
                  }
               }
448 449 450
               if (retcode < 0) {
                  giterr_set(GITERR_REFERENCE, "Couldn't find a match for %s", movement);
               }
451 452 453 454 455 456 457
               regfree(&preg);
            }

            git_buf_free(&buf);
            git_revwalk_free(walk);
         }
         return retcode;
458 459
      }

460
      /* {...} -> Dereference until we reach an object of a certain type. */
461 462 463 464
      if (dereference_to_type(out, obj, parse_obj_type(movement)) < 0) {
         return GIT_ERROR;
      }
      return 0;
465 466 467
   }

   /* Dereference until we reach a commit. */
468
   if (dereference_to_type(&obj, obj, GIT_OBJ_COMMIT) < 0) {
469 470
      /* Can't dereference to a commit; fail */
      return GIT_ERROR;
471 472
   }

473
   /* "^" is the same as "^1" */
474
   if (movementlen == 0) {
475 476 477 478 479 480 481 482
      n = 1;
   } else {
      git__strtol32(&n, movement, NULL, 0);
   }
   commit = (git_commit*)obj;

   /* "^0" just returns the input */
   if (n == 0) {
483
      *out = obj;
484 485
      return 0;
   }
486

487 488 489 490 491
   if (git_commit_parent(&commit, commit, n-1) < 0) {
      return GIT_ERROR;
   }

   *out = (git_object*)commit;
492 493
   return 0;
}
494

495 496 497 498 499 500 501 502 503 504 505 506
static int handle_linear_syntax(git_object **out, git_object *obj, const char *movement)
{
   git_commit *commit1, *commit2;
   int i, n;

   /* Dereference until we reach a commit. */
   if (dereference_to_type(&obj, obj, GIT_OBJ_COMMIT) < 0) {
      /* Can't dereference to a commit; fail */
      return GIT_ERROR;
   }

   /* "~" is the same as "~1" */
507
   if (*movement == '\0') {
508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533
      n = 1;
   } else {
      git__strtol32(&n, movement, NULL, 0);
   }
   commit1 = (git_commit*)obj;

   /* "~0" just returns the input */
   if (n == 0) {
      *out = obj;
      return 0;
   }

   for (i=0; i<n; i++) {
      if (git_commit_parent(&commit2, commit1, 0) < 0) {
         return GIT_ERROR;
      }
      if (commit1 != (git_commit*)obj) {
         git_commit_free(commit1);
      }
      commit1 = commit2;
   }

   *out = (git_object*)commit1;
   return 0;
}

Ben Straub committed
534
static int oid_for_tree_path(git_oid *out, git_tree *tree, git_repository *repo, const char *path)
535 536 537
{
   char *str = git__strdup(path);
   char *tok;
538
   void *alloc = str;
539 540 541 542 543 544
   git_tree *tree2 = tree;
   const git_tree_entry *entry;

   while ((tok = git__strtok(&str, "/\\")) != NULL) {
      entry = git_tree_entry_byname(tree2, tok);
      if (tree2 != tree) git_tree_free(tree2);
545
      if (git_tree_entry__is_tree(entry)) {
546
         if (git_tree_lookup(&tree2, repo, &entry->oid) < 0) {
Ben Straub committed
547
            git__free(alloc);
548
            return GIT_ERROR;
549 550 551 552
         }
      }
   }

553
   git_oid_cpy(out, git_tree_entry_id(entry));
554
   git__free(alloc);
555
   return 0;
556 557 558 559 560 561 562 563
}

static int handle_colon_syntax(git_object **out,
                               git_repository *repo,
                               git_object *obj,
                               const char *path)
{
   git_tree *tree;
564
   git_oid oid;
565 566 567 568 569 570 571 572

   /* Dereference until we reach a tree. */
   if (dereference_to_type(&obj, obj, GIT_OBJ_TREE) < 0) {
      return GIT_ERROR;
   }
   tree = (git_tree*)obj;

   /* Find the blob at the given path. */
Ben Straub committed
573
   oid_for_tree_path(&oid, tree, repo, path);
574
   git_tree_free(tree);
575
   return git_object_lookup(out, repo, &oid, GIT_OBJ_ANY);
576 577
}

578
static int revparse_global_grep(git_object **out, git_repository *repo, const char *pattern)
579 580 581 582
{
   git_revwalk *walk;
   int retcode = GIT_ERROR;

583 584 585 586 587
   if (!pattern[0]) {
      giterr_set(GITERR_REGEX, "Empty pattern");
      return GIT_ERROR;
   }

588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625
   if (!git_revwalk_new(&walk, repo)) {
      regex_t preg;
      int reg_error;
      git_oid oid;

      git_revwalk_sorting(walk, GIT_SORT_TIME);
      git_revwalk_push_glob(walk, "refs/heads/*");

      reg_error = regcomp(&preg, pattern, REG_EXTENDED);
      if (reg_error != 0) {
         giterr_set_regex(&preg, reg_error);
      } else {
         git_object *walkobj = NULL, *resultobj = NULL;
         while(!git_revwalk_next(&oid, walk)) {
            /* Fetch the commit object, and check for matches in the message */
            if (walkobj != resultobj) git_object_free(walkobj);
            if (!git_object_lookup(&walkobj, repo, &oid, GIT_OBJ_COMMIT)) {
               if (!regexec(&preg, git_commit_message((git_commit*)walkobj), 0, NULL, 0)) {
                  /* Match! */
                  resultobj = walkobj;
                  retcode = 0;
                  break;
               }
            }
         }
         if (!resultobj) {
            giterr_set(GITERR_REFERENCE, "Couldn't find a match for %s", pattern);
         } else {
            *out = resultobj;
         }
         regfree(&preg);
         git_revwalk_free(walk);
      }
   }

   return retcode;
}

626 627
int git_revparse_single(git_object **out, git_repository *repo, const char *spec)
{
628
   revparse_state current_state = REVPARSE_STATE_INIT,  next_state = REVPARSE_STATE_INIT;
629
   const char *spec_cur = spec;
630 631
   git_object *cur_obj = NULL,  *next_obj = NULL;
   git_buf specbuffer = GIT_BUF_INIT,  stepbuffer = GIT_BUF_INIT;
632
   int retcode = 0;
633 634 635

   assert(out && repo && spec);

636
   if (spec[0] == ':') {
637
      if (spec[1] == '/') {
638
         return revparse_global_grep(out, repo, spec+2);
639 640
      }
      /* TODO: support merge-stage path lookup (":2:Makefile"). */
641 642 643 644
      giterr_set(GITERR_INVALID, "Unimplemented");
      return GIT_ERROR;
   }

645
   while (current_state != REVPARSE_STATE_DONE) {
646 647 648 649
      switch (current_state) {
      case REVPARSE_STATE_INIT:
         if (!*spec_cur) {
            /* No operators, just a name. Find it and return. */
650 651
            retcode = revparse_lookup_object(out, repo, spec);
            next_state = REVPARSE_STATE_DONE;
652
         } else if (*spec_cur == '@') {
653
            /* '@' syntax doesn't allow chaining */
654
            git_buf_puts(&stepbuffer, spec_cur);
655
            retcode = walk_ref_history(out, repo, git_buf_cstr(&specbuffer), git_buf_cstr(&stepbuffer));
656
            next_state = REVPARSE_STATE_DONE;
657 658 659 660
         } else if (*spec_cur == '^') {
            next_state = REVPARSE_STATE_CARET;
         } else if (*spec_cur == '~') {
            next_state = REVPARSE_STATE_LINEAR;
661 662
         } else if (*spec_cur == ':') {
            next_state = REVPARSE_STATE_COLON;
663 664
         } else {
            git_buf_putc(&specbuffer, *spec_cur);
665 666 667
         }
         spec_cur++;

668
         if (current_state != next_state && next_state != REVPARSE_STATE_DONE) {
669
            /* Leaving INIT state, find the object specified, in case that state needs it */
670 671 672 673
            if (revparse_lookup_object(&next_obj, repo, git_buf_cstr(&specbuffer)) < 0) {
               retcode = GIT_ERROR;
               next_state = REVPARSE_STATE_DONE;
            }
674 675 676
         }
         break;

677 678 679 680

      case REVPARSE_STATE_CARET:
         /* Gather characters until NULL, '~', or '^' */
         if (!*spec_cur) {
681
            retcode = handle_caret_syntax(out, repo, cur_obj, git_buf_cstr(&stepbuffer));
682
            next_state = REVPARSE_STATE_DONE;
683
         } else if (*spec_cur == '~') {
684
            retcode = handle_caret_syntax(&next_obj, repo, cur_obj, git_buf_cstr(&stepbuffer));
685
            git_buf_clear(&stepbuffer);
686
            next_state = !retcode ? REVPARSE_STATE_LINEAR : REVPARSE_STATE_DONE;
687
         } else if (*spec_cur == '^') {
688
            retcode = handle_caret_syntax(&next_obj, repo, cur_obj, git_buf_cstr(&stepbuffer));
689
            git_buf_clear(&stepbuffer);
690 691 692
            if (retcode < 0) {
               next_state = REVPARSE_STATE_DONE;
            }
693 694
         } else {
            git_buf_putc(&stepbuffer, *spec_cur);
695 696 697 698
         }
         spec_cur++;
         break;

699
      case REVPARSE_STATE_LINEAR:
700
         if (!*spec_cur) {
701 702
            retcode = handle_linear_syntax(out, cur_obj, git_buf_cstr(&stepbuffer));
            next_state = REVPARSE_STATE_DONE;
703
         } else if (*spec_cur == '~') {
704 705 706 707 708
            retcode = handle_linear_syntax(&next_obj, cur_obj, git_buf_cstr(&stepbuffer));
            git_buf_clear(&stepbuffer);
            if (retcode < 0) {
               next_state = REVPARSE_STATE_DONE;
            }
709
         } else if (*spec_cur == '^') {
710 711 712
            retcode = handle_linear_syntax(&next_obj, cur_obj, git_buf_cstr(&stepbuffer));
            git_buf_clear(&stepbuffer);
            next_state = !retcode ? REVPARSE_STATE_CARET : REVPARSE_STATE_DONE;
713 714 715 716
         } else {
            git_buf_putc(&stepbuffer, *spec_cur);
         }
         spec_cur++;
717
         break;
718

719 720 721 722 723 724 725 726 727 728
      case REVPARSE_STATE_COLON:
         if (*spec_cur) {
            git_buf_putc(&stepbuffer, *spec_cur);
         } else {
            retcode = handle_colon_syntax(out, repo, cur_obj, git_buf_cstr(&stepbuffer));
            next_state = REVPARSE_STATE_DONE;
         }
         spec_cur++;
         break;

729
      case REVPARSE_STATE_DONE:
730 731
         if (cur_obj && *out != cur_obj) git_object_free(cur_obj);
         if (next_obj && *out != next_obj) git_object_free(next_obj);
732
         break;
733 734 735
      }

      current_state = next_state;
736
      if (cur_obj != next_obj) {
737
         if (cur_obj) git_object_free(cur_obj);
738 739
         cur_obj = next_obj;
      }
740
   }
741

742 743
   if (*out != cur_obj) git_object_free(cur_obj);
   if (*out != next_obj && next_obj != cur_obj) git_object_free(next_obj);
744

745 746 747
   git_buf_free(&specbuffer);
   git_buf_free(&stepbuffer);
   return retcode;
748
}