Hi,
On Fri, Oct 26, 2012 at 3:33 PM, Michael J Gruber
<git@xxxxxxxxxxxxxxxxxxxx> wrote:
> 'git replace' parses the revision arguments when it creates replacements
> (so that a sha1 can be abbreviated, e.g.) but not when deleting
> replacements.
>
> This sucks.
>
> Make it parse the argument to 'replace -d' in the same way.
Nit: there could be more than one argument to 'replace -d', so perhaps
"each argument" is better.
> Just in case someone lost the replacement object before deleting the
> replacement, take the argument literally if it can not be resolved to a
Here too.
> full sha1.
>
> Signed-off-by: Michael J Gruber <git@xxxxxxxxxxxxxxxxxxxx>
> ---
> builtin/replace.c | 15 ++++++++++-----
> 1 file changed, 10 insertions(+), 5 deletions(-)
>
> diff --git a/builtin/replace.c b/builtin/replace.c
> index e3aaf70..80e2039 100644
> --- a/builtin/replace.c
> +++ b/builtin/replace.c
> @@ -46,24 +46,29 @@ typedef int (*each_replace_name_fn)(const char *name, const char *ref,
>
> static int for_each_replace_name(const char **argv, each_replace_name_fn fn)
> {
> - const char **p;
> + const char **p, *q;
> char ref[PATH_MAX];
> int had_error = 0;
> unsigned char sha1[20];
>
> for (p = argv; *p; p++) {
> - if (snprintf(ref, sizeof(ref), "refs/replace/%s", *p)
> + q = *p;
> + if (get_sha1(q, sha1))
> + warning("Failed to resolve '%s' as a valid ref; taking it literally.", q);
> + else
> + q = sha1_to_hex(sha1);
> + if (snprintf(ref, sizeof(ref), "refs/replace/%s", q)
> >= sizeof(ref)) {
> - error("replace ref name too long: %.*s...", 50, *p);
> + error("replace ref name too long: %.*s...", 50, q);
> had_error = 1;
> continue;
> }
> if (read_ref(ref, sha1)) {
> - error("replace ref '%s' not found.", *p);
> + error("replace ref '%s' not found.", q);
> had_error = 1;
> continue;
> }
> - if (fn(*p, ref, sha1))
> + if (fn(q, ref, sha1))
> had_error = 1;
> }
> return had_error;
Looks good to me.
Thanks,
Christian.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html