@matheusbsbs / matheus-bagliano / commits / 62f162f8e7

rev-parse: be more careful with munging arguments

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>

Jeff King committed Dec 6, 2013 at 17:07 UTC 62f162f8e7c28cd60f0c18f5e69933efd72659e0

1 file changed +5 -1

builtin/rev-parse.c

+5 -1

@@ -279,6 +279,7 @@ static int try_difference(const char *arg)

279 exclude = n;

280 }

281 }

282 + *dotdot = '.';

283 return 1;

284 }

285 *dotdot = '.';

@@ -302,8 +303,10 @@ static int try_parent_shorthands(const char *arg)

303 return 0;

304

305 *dotdot = 0;

305 - if (get_sha1_committish(arg, sha1))

306 + if (get_sha1_committish(arg, sha1)) {

307 + *dotdot = '^';

308 return 0;

309 + }

310

311 if (!parents_only)

312 show_rev(NORMAL, sha1, arg);

@@ -312,6 +315,7 @@ static int try_parent_shorthands(const char *arg)

315 show_rev(parents_only ? NORMAL : REVERSED,

316 parents->item->object.sha1, arg);

317

318 + *dotdot = '^';

319 return 1;

320 }

321