Re: git mailinfo with patch parser

* Junio C. Hamano: >> Is there a way to get the patch data, as parsed by git apply or git >> am, and dump it back in patch format, without actually applying the >> patch to a working tree? > > So, "the patch data as used by apply" is what you get from mailinfo. > If it is a patch that applies to w

git mailinfo with patch parser

git mailinfo splits a message into headers, commit message, and patch text, but does not actually parse the patch text. As a result, the patch portion produced by git mailinfo can contain something that looks like a patch, but actually isn't. Is there a way to get the patch data, as parsed by git

Re: [PATCH v2] rev-parse: check lookup'ed commit references for NULL

On 05/24/2018 04:04 PM, Todd Zullinger wrote: I added Florian to Cc, in case he wants to provide a preferred address. Sorry, using this address is fine. Thanks, Florian

Re: Deleting a branch after merging it results in "there may be uncommitted changes"

On 10/05/2017 05:04 AM, Joshua Lamusga wrote: Anyway, I follow a very simple merging model for this one-person project. Recently, I made a new local branch off of develop called feature-printing. After checking out feature-printing, making my changes, and committing changes, I merged it with deve

Re: Is git am supposed to decode MIME?

On 10/04/2017 11:25 AM, Jeff King wrote: On Wed, Oct 04, 2017 at 10:44:31AM +0200, Florian Weimer wrote: The git am documentation talks about “mailboxes”. I suppose these contain messages in Internet Mail syntax. Is git am supposed to decode MIME? I'm asking because I have a message

Re: Special strings in commit messages

On 10/08/2017 11:30 PM, Eric Wong wrote: diff --git a/git-rebase--am.sh b/git-rebase--am.sh index 6e64d40d6f..14c50782e0 100644 --- a/git-rebase--am.sh +++ b/git-rebase--am.sh @@ -53,6 +53,7 @@ else git format-patch -k --stdout --full-index --cherry-pick --right-only \ --sr

Special strings in commit messages

I have a commit which looks like this: $ git cat-file commit 4ca76eb7b47724c2444dfea7890fa8db4edd5762 tree c845be47a0653624b1984d0dc1a0b485b527811d parent 9eee98638ef06149e17f94afaa357e3a9e296e69 author Florian Weimer 1507481682 +0200 committer Florian Weimer 1507481682 +0200 19: glibc-fedora

Is git am supposed to decode MIME?

The git am documentation talks about “mailboxes”. I suppose these contain messages in Internet Mail syntax. Is git am supposed to decode MIME? I'm asking because I have a message whose body is encoded as quoted-printable, but git am does not parse the patch contained in it. If git am is su

Re: Produce contents of index with existing directory as cache

On 08/30/2017 04:55 PM, David Lloyd wrote: > On Wed, Aug 30, 2017 at 9:18 AM, Florian Weimer wrote: >> On 08/30/2017 04:15 PM, David Lloyd wrote: >>> git reset --hard ? >> >> That doesn't remove unstaged files. > Ah, does it not? Perhaps add a "git

Re: Produce contents of index with existing directory as cache

On 08/30/2017 04:15 PM, David Lloyd wrote: > git reset --hard ? That doesn't remove unstaged files. Florian

Produce contents of index with existing directory as cache

Is there a variant of “git checkout-index” which will produce the existing index contents, like “git checkout-index” would do with an empty directory, but can reuse an existing directory tree, to avoid writing all files from scratch? I'm writing some analysis scripts which need to change a checked

Re: fix mktemp (remove mktemp ;)

* Herbert Xu: > Paul Jackson <[EMAIL PROTECTED]> wrote: >> >> Even mktemp(1) can collide, in theory, since there is no practical way >> in shell scripts to hold open and locked the file from the instant of it >> is determined to be a unique name. > > mktemp(1) creates the file before exiting. Ot