public inbox for git@vger.kernel.org 
 help / color / mirror / Atom feed

From: greened@obbligato•org
To: James Nylen <jnylen@gmail•com>
Cc: git@vger•kernel.org
Subject: Re: [PATCH] Add --unannotate option to git-subtree
Date: Mon, 31 Dec 2012 19:15:23 -0600	[thread overview]
Message-ID: <87a9st4sb8.fsf@waller.obbligato.org> (raw)
In-Reply-To: <CABVa4NinSighUn7GKbzMx9qZj3Ao2dCtEZxUqCPwO9TocZ8Kkg@mail.gmail.com> (James Nylen's message of "Tue, 9 Oct 2012 16:26:50 -0400")

James Nylen <jnylen@gmail•com> writes:

> Rather than adding a marker to each commit when splitting out the
> commits back to the subproject, --unannotate removes the specified
> string (or bash glob pattern) from the beginning of the first line of
> the commit message.  This enables the following workflow:

I applied the patch to my working copy but it doesn't seem to do
what I'd expect.  The test script does something like this:

- create project A
- add file to project A with message "subproj: add F1"
- add file to project A with message "subproj: add F2"
- add project A as a subtree of project B under directory subdir
- add a file to subdir with message "subproj: add F3"
- do a split --unannotate="subproj:"

I expected to see a log with no mention of "subproj" anywhere.  Instead
I get:

add F3
subproj: add F2
subproj: add F1

Is this as you intend?  Is --unannotate only supposed to strip the
string for commits added when A was a subtree of B?

I guess this behavior makes sense in that the user would want to
see the same commits that existed before A became a subproject.

                   -David

next prev parent reply	other threads:[~2013-01-01  1:16 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-10-09 20:26 [PATCH] Add --unannotate option to git-subtree James Nylen
2012-10-16 12:47 ` James Nylen
2012-10-20 19:33   ` Herman van Rink
2012-12-31 23:19     ` greened
2013-01-01  1:15 ` greened [this message]
2013-01-17 20:56   ` James Nylen
2013-01-22  8:41     ` greened

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

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

  git send-email \
    --in-reply-to=87a9st4sb8.fsf@waller.obbligato.org \
    --to=greened@obbligato$(echo .)org \
    --cc=git@vger$(echo .)kernel.org \
    --cc=jnylen@gmail$(echo .)com \
    /path/to/YOUR_REPLY

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

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox