git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Christian Couder <christian.couder@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git <git@vger.kernel.org>
Subject: Re: What's cooking in git.git (Apr 2019, #02; Wed, 10)
Date: Thu, 11 Apr 2019 17:06:06 +0200	[thread overview]
Message-ID: <CAP8UFD2KsjPo7G0BtzXfA3gyoUyR7y_WsNLm3mn39O8h4n+Kfw@mail.gmail.com> (raw)
In-Reply-To: <xmqqr2ab2gs6.fsf@gitster-ct.c.googlers.com>

On Tue, Apr 9, 2019 at 8:08 PM Junio C Hamano <gitster@pobox.com> wrote:

> * cc/replace-graft-peel-tags (2019-04-01) 4 commits
>  - replace: fix --graft when passing a tag first
>  - replace: fix --graft when passing a tag as parent
>  - t6050: redirect expected error output to a file
>  - t6050: use test_line_count instead of wc -l
>
>  When given a tag that points at a commit-ish, "git replace --graft"
>  failed to peel the tag before writing a replace ref, which did not
>  make sense because the old graft mechanism the feature wants to
>  mimick only allowed to replace one commit object with another.
>  This has been fixed.
>
>  The title of the top two commits are fairly useless and does not
>  say how the issue was fixed, but the fix is to peel the given tag
>  ourselves down to the underlying commit object.

I can send a new version where the top two commits have the following titles:

  - replace: peel tag when passing a tag first to --graft
  - replace: peel tag when passing a tag as parent to --graft

I am also ok with you changing the titles, as you prefer.

Thanks!

  parent reply	other threads:[~2019-04-11 15:06 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-04-09 18:08 What's cooking in git.git (Apr 2019, #02; Wed, 10) Junio C Hamano
2019-04-09 18:22 ` Denton Liu
2019-04-10  3:09   ` Junio C Hamano
2019-04-09 19:18 ` Thomas Gummerer
2019-04-10  3:01   ` Junio C Hamano
2019-04-10 20:45     ` Thomas Gummerer
2019-04-10 22:13     ` Johannes Schindelin
2019-04-10  0:46 ` Todd Zullinger
2019-04-10 10:12 ` Phillip Wood
2019-04-10 22:15   ` Johannes Schindelin
2019-04-10 18:29 ` Mazo, Andrey
2019-04-10 21:51 ` nd/switch-and-restore, was " Johannes Schindelin
2019-04-10 21:56 ` dl/warn-tagging-a-tag, " Johannes Schindelin
2019-04-12  1:51   ` Junio C Hamano
2019-04-10 22:32 ` jh/trace2-sid-fix, " Johannes Schindelin
2019-04-11 15:06 ` Christian Couder [this message]
2019-04-14  3:55   ` Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=CAP8UFD2KsjPo7G0BtzXfA3gyoUyR7y_WsNLm3mn39O8h4n+Kfw@mail.gmail.com \
    --to=christian.couder@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).