threads / discuss / 37879

Odd git am behavior rewriting subject, adding "ASoC: " prefix

Subject: Odd git am behavior rewriting subject, adding "ASoC: " prefix

## tl;dr

3 messages between Nov 5, 2014 and Nov 5, 2014.

replies: 2people: 2as markdown or json

Joe Perches· Nov 5, 2014, 01:12 UTC · lore

I have a patch file created by git format-patch.

Applying it via git am changes the subject prefix. Anyone know why?

$ git --version git version 2.1.2

$ git am -i 0002-staging-ft1000-Logging-message-neatening.patch Commit Body is: -------------------------- staging: ft1000: Logging message neatening

Use a more common logging style.

o Convert DEBUG macros to pr_debug o Add pr_fmt o Remove embedded function names from pr_debug o Convert printks to pr_<level> o Coalesce formats and align arguments o Add missing terminating newlines

Signed-off-by: Joe Perches <joe@perches.com>
--------------------------
Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all

choosing "Y" emits:

Applying: ASoC: staging: ft1000: Logging message neatening

ASoC:? where does that come from?

Chris Packham· Nov 5, 2014, 09:12 UTC · re: Joe Perches · lore

Re: Odd git am behavior rewriting subject, adding "ASoC: " prefix

On Wed, Nov 5, 2014 at 2:12 PM, Joe Perches <joe@perches.com> wrote:

Show 33 quoted lines

> I have a patch file created by git format-patch.
>
> Applying it via git am changes the subject prefix.
> Anyone know why?
>
> $ git --version
> git version 2.1.2
>
> $ git am -i 0002-staging-ft1000-Logging-message-neatening.patch
> Commit Body is:
> --------------------------
> staging: ft1000: Logging message neatening
>
> Use a more common logging style.
>
> o Convert DEBUG macros to pr_debug
> o Add pr_fmt
> o Remove embedded function names from pr_debug
> o Convert printks to pr_<level>
> o Coalesce formats and align arguments
> o Add missing terminating newlines
>
> Signed-off-by: Joe Perches <joe@perches.com>
> --------------------------
> Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all
>
> choosing "Y" emits:
>
> Applying: ASoC: staging: ft1000: Logging message neatening
>
> ASoC:? where does that come from?
>
>

Looks like you have an apply-patch-msg hook installed. What does the output of 'ls -l .git/hooks' look like.

Joe Perches· Nov 5, 2014, 13:51 UTC · re: Chris Packham · lore

Re: Odd git am behavior rewriting subject, adding "ASoC: " prefix

On Wed, 2014-11-05 at 22:12 +1300, Chris Packham wrote:

> On Wed, Nov 5, 2014 at 2:12 PM, Joe Perches <joe@perches.com> wrote:
> > I have a patch file created by git format-patch.

[]

> > ASoC:? where does that come from?

[]

> Looks like you have an apply-patch-msg hook installed. What does the
> output of 'ls -l .git/hooks' look like.

Correct.  I didn't look there.  Thanks.