Rev parse #684
Merged
Rev parse #684
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
added 28 commits
May 11, 2012 11:30
This version supports refspecs of these kinds: - Full & partial SHAs - Output from "git describe" - "/refs/heads/master" (full ref names) - "master" (partial ref names) - "FETCH_HEAD" (named heads)
New tests for "foo^2" syntax, but they don't pass
yet. Support for chaining these, i.e.
"foo^2~3^{u}~1' is starting to shape up.
Supported forms:
- "^n"
- "^0"
- "^"
Still missing: all of the "^{…}" variants.
Also extended the test suite to include chaining operators, e.g. "master^2~3^4".
Added some reflags to the test repo to support unit tests.
in the test repo.
Removed repeated strlen's, and unnecessary loop-termination variable.
Added tracking configuration to the test repo's config to support unit tests.
Ported date.c (for approxidate_careful) from git.git revision aa39b85. Trimmed out the parts we're not using.
Fixed an error where "nonexistant^N" or similar would fall into an assert. This now properly returns an error.
Closed
Conflicts: src/util.h tests-clar/refs/branches/listall.c
|
|
||
| #include "git2/types.h" | ||
|
|
||
| int git__date_parse(git_time_t *out, const char *date); |
There was a problem hiding this comment.
Strikes me as a waste of a header. Do you think you could move this to util.h?
|
Almost there. 🏩 |
| if (tree2 != tree) git_tree_free(tree2); | ||
| if (entry_is_tree(entry)) { | ||
| if (git_tree_lookup(&tree2, repo, &entry->oid) < 0) { | ||
| free(alloc); |
There was a problem hiding this comment.
Use git__free() instead of free(), please - it is just a #define for now, but I have a branch that uses it to do allocation logging
added 6 commits
June 6, 2012 12:25
This test is intended to verify that 64-bit machines can handle parsing dates in 2039 and beyond, and fails on 32-bit machines. It is now omitted when run on a 32-bit machine to eliminate an expected failure.
Converted an internal utility to return an oid, rather than a tree entry (whose lifetime is tied to the parent tree, which was freed before returning).
| if (tree2 != tree) git_tree_free(tree2); | ||
| if (git_tree_entry__is_tree(entry)) { | ||
| if (git_tree_lookup(&tree2, repo, &entry->oid) < 0) { | ||
| free(alloc); |
There was a problem hiding this comment.
It's still necessary. I'll give it a better name, though.
There was a problem hiding this comment.
Ehrm... I meant that this is supposed to be git__free...
|
Congratulations on your first major libgit2 ship! 🚢✨⛵✨🚢🚢✨⛵✨🚢🚢✨⛵✨🚢🚢✨⛵✨🚢🚢✨⛵✨🚢🚢✨⛵✨🚢🚢✨⛵✨🚢🚢✨⛵✨🚢🚢✨⛵✨🚢🚢✨⛵✨🚢🚢✨⛵✨🚢🚢✨⛵✨🚢🚢✨⛵✨🚢🚢✨⛵✨🚢🚢✨⛵✨🚢🚢✨⛵✨🚢🚢✨⛵✨🚢🚢✨⛵✨🚢🚢✨⛵✨🚢🚢✨⛵✨🚢🚢✨⛵✨🚢🚢✨⛵✨🚢🚢✨⛵✨🚢🚢✨⛵✨🚢🚢✨⛵✨🚢🚢✨⛵✨🚢🚢✨⛵✨🚢🚢✨⛵✨🚢🚢✨⛵✨🚢🚢✨⛵✨🚢 |
vmg
pushed a commit
that referenced
this pull request
Jun 7, 2012
phatblat
pushed a commit
to phatblat/libgit2
that referenced
this pull request
Sep 13, 2014
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Support for the rev-parse revision-specification language, which takes a string and provides a
git_object. So far, these are working:a65fedf39aefe402d3bb6e24df4d4f5fe4547750-> object with that exact hasha65fedf39a-> object with that hash prefix (usesgit_object_lookup_prefix)v0.16.0-234-gd98fa70(output fromgit describe) -> object with the hash prefix that follows "-g"refs/heads/masterormaster-> object pointed to by a fully- or partially-named reftag^{}-> dereference until we find something that isn't a tagtag^{tree}-> dereference until we find an object of the given typetag^ormaster^3-> dereference until we find a commit, then get the Nth parenttag~3-> commit that is N steps back from the ref, always following the 1st parentHEAD@{2}-> object that was pointed to by a ref N steps back in the reflogbranch@{yesterday},master@{5 minutes ago}-> object that was pointed to by a ref at the specified time@{-3}-> commit pointed to by the Nth branch checked out before the current onetag^{/foo}-> youngest commit whose message matches the regex after "/", which is reachable from the given starting point:/foo-> youngest commit whose message matches the regex after "/", which is reachable from any reftag:README.md-> dereference to a tree, then return the blob or tree at the given pathThings that are still missing:
:2:Makefile-> blob object in the index at the given merge stageThe entry point is
git_revparse_single, and it's expected that there will eventually be agit_revparse_rangewhich supports the rev-parse syntax for finding ranges of commits (a lagit rev-list).[This is a rebased version of #648.]