undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rev-parse: be more careful with munging arguments

Browse Source 
When rev-parse looks at whether an argument like "foo..bar" or
"foobar^@" is a difference or parent-shorthand, it internally
munges the arguments so that it can pass the individual rev
arguments to get_sha1(). However, we do not consistently un-munge
the result.

For cases where we do not match (e.g., "doesnotexist..HEAD"), we
would then want to try to treat the argument as a filename.
try_difference gets() this right, and always unmunges in this case.
However, try_parent_shorthand() never unmunges, leading to incorrect
error messages, or even incorrect results:

  $ git rev-parse foobar^@
  foobar
  fatal: ambiguous argument 'foobar': unknown revision or path not in the working tree.
  Use '--' to separate paths from revisions, like this:
  'git <command> [<revision>...] -- [<file>...]'

  $ >foobar
  $ git rev-parse foobar^@
  foobar

For cases where we do match, neither function unmunges. This does
not currently matter, since we are done with the argument. However,
a future patch will do further processing, and this prepares for
it. In addition, it's simply a confusing interface for some cases to
modify the const argument, and others not to.

Signed-off-by: Jeff King <peff@peff.net>
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff King 2013-12-06 17:07:52 -05:00 committed by Junio C Hamano
parent 1418567381
commit 62f162f8e7
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
builtin/rev-parse.c
View File

@ -279,6 +279,7 @@ static int try_difference(const char *arg)
exclude = n;
}
}
*dotdot = '.';
return 1;
}
*dotdot = '.';
@ -302,8 +303,10 @@ static int try_parent_shorthands(const char *arg)
return 0;
*dotdot = 0;
if (get_sha1_committish(arg, sha1))
if (get_sha1_committish(arg, sha1)) {
*dotdot = '^';
return 0;
}
if (!parents_only)
show_rev(NORMAL, sha1, arg);
@ -312,6 +315,7 @@ static int try_parent_shorthands(const char *arg)
show_rev(parents_only ? NORMAL : REVERSED,
parents->item->object.sha1, arg);
*dotdot = '^';
return 1;
}