git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH] replace: parse revision argument for -d

From
Christian Couder <christian.couder@gmail.com>
Date
Oct 26, 2012, 15:25 UTC
Message-ID
<CAP8UFD3MNwpwzD-eNEHDLRSkLskXfW-tF061U=Nxc-OrTf4znw@mail.gmail.com>
In-Reply-To
<807340e40adb1fc97cd97161fe1fabd292bc79c3.1351258394.git.git@drmicha.warpmail.net>
Hi,

On Fri, Oct 26, 2012 at 3:33 PM, Michael J Gruber <git@drmicha.warpmail.net> wrote:

Show 7 quoted lines
> '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.
Show 46 quoted lines
> full sha1.
>
> Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
> ---
>  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.

Previous: Michael J GruberNext: Jeff King
Message 2 of 22 in “replace: parse revision argument for -d”
  1. replace: parse revision argument for -dMichael J Gruber, Oct 26, 2012
  2. Christian CouderOct 26, 2012
  3. Jeff KingOct 29, 2012
  4. Michael J GruberOct 29, 2012
  5. Jeff KingOct 29, 2012
  6. Michael J GruberOct 29, 2012
  7. [PATCHv2] replace: parse revision argument for -dMichael J Gruber, Oct 29, 2012
  8. Jeff KingNov 9, 2012
  9. Michael J GruberNov 12, 2012
  10. [PATCHv3] replace: parse revision argument for -dMichael J Gruber, Nov 12, 2012
  11. Jeff KingNov 12, 2012
  12. Michael J GruberNov 13, 2012
  13. [PATCHv4] replace: parse revision argument for -dMichael J Gruber, Nov 13, 2012
  14. Jeff KingNov 13, 2012
  15. Notes in format-patch (was: Re: [PATCHv3] replace: parse revision argument for -d)Michael J Gruber, Nov 13, 2012
  16. Jeff KingNov 13, 2012
  17. Junio C HamanoNov 13, 2012
  18. Junio C HamanoNov 13, 2012
  19. Junio C HamanoNov 13, 2012
  20. Junio C HamanoNov 13, 2012
  21. Michael J GruberNov 14, 2012
  22. Junio C HamanoNov 14, 2012

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.