proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-12-30 18:05:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

revparse: detect incorrect "refname@{-n}" syntax

Browse Source
This commit is contained in:
nulltoken 2012-07-05 22:26:14 +02:00
parent 1decf88bc1
commit cab65c2b23
2 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/revparse.c
View File

@ -21,9 +21,10 @@ typedef enum {
REVPARSE_STATE_DONE,
} revparse_state;
static void set_invalid_syntax_err(const char *spec)
static int revspec_error(const char *revspec)
{
giterr_set(GITERR_INVALID, "Refspec '%s' is not valid.", spec);
giterr_set(GITERR_INVALID, "Failed to parse revision specifier - Invalid pattern '%s'", revspec);
return -1;
}
static int revparse_lookup_fully_qualifed_ref(git_object **out, git_repository *repo, const char*spec)
@ -154,21 +155,19 @@ static int walk_ref_history(git_object **out, git_repository *repo, const char *
size_t reflogspeclen = strlen(reflogspec);
if (git__prefixcmp(reflogspec, "@{") != 0 ||
git__suffixcmp(reflogspec, "}") != 0) {
giterr_set(GITERR_INVALID, "Bad reflogspec '%s'", reflogspec);
return GIT_ERROR;
}
git__suffixcmp(reflogspec, "}") != 0)
return revspec_error(reflogspec);
/* "@{-N}" form means walk back N checkouts. That means the HEAD log. */
if (refspeclen == 0 && !git__prefixcmp(reflogspec, "@{-")) {
if (!git__prefixcmp(reflogspec, "@{-")) {
regex_t regex;
int regex_error;
if (git__strtol32(&n, reflogspec+3, NULL, 0) < 0 ||
n < 1) {
giterr_set(GITERR_INVALID, "Invalid reflogspec %s", reflogspec);
return GIT_ERROR;
}
if (refspeclen > 0)
return revspec_error(reflogspec);
if (git__strtol32(&n, reflogspec+3, NULL, 0) < 0 || n < 1)
return revspec_error(reflogspec);
if (!git_reference_lookup(&ref, repo, "HEAD")) {
if (!git_reflog_read(&reflog, ref)) {
@ -373,10 +372,8 @@ static int handle_caret_syntax(git_object **out, git_repository *repo, git_objec
int n;
if (*movement == '{') {
if (movement[movementlen-1] != '}') {
set_invalid_syntax_err(movement);
return GIT_ERROR;
}
if (movement[movementlen-1] != '}')
return revspec_error(movement);
/* {} -> Dereference until we reach an object that isn't a tag. */
if (movementlen == 2) {

1
tests-clar/refs/revparse.c
View File

@ -133,6 +133,7 @@ void test_refs_revparse__reflog(void)
{
cl_git_fail(git_revparse_single(&g_obj, g_repo, "@{-xyz}"));
cl_git_fail(git_revparse_single(&g_obj, g_repo, "@{-0}"));
cl_git_fail(git_revparse_single(&g_obj, g_repo, "master@{-2}"));
cl_git_fail(git_revparse_single(&g_obj, g_repo, "@{1000}"));
test_object("nope@{0}", NULL);