Re: [lmi] Proposed workflow for proprietary repository

[Vadim Zeitlin]

On Thu, 10 Mar 2016 20:31:12 +0000 Greg Chicares <address@hidden> wrote:

GC> On 2016-03-10 14:17, Vadim Zeitlin wrote:
GC> [...]
GC> >  So I'd recommend doing "git reset --hard b5f2b3d" above and then running
GC> > "git am --committer-data-is-author-date /path/to/first.patch" again. If it
GC> > works this time, then you should obtain the same SHA-1 as Greg and be able
GC> > to apply the second patch on top of it.
GC> 
GC> That didn't work. After trying and retrying the whole process from scratch
GC> (including recreating a virgin repository) several times, Kim found a way
GC> to make it work: use 'git config' to set her name and email address equal
GC> to mine before applying my patches. That works: same sha1sums. Any other
GC> identity fails: the patches apply correctly, but the sha1sums differ.

 Oh, yes, of course, sorry, I should have, once again, foreseen this in
advance. To obtain the same SHA-1 sum, you need to also use the same
committer information and while Git takes the authorship information from
the patch, it is not the case for the committer (you can see both with
--format=full git log option, for example).

 To obtain the same SHA-1 you do need to use the same committer as well,
which can be achieved, in addition to globally modifying git configuration,
by setting GIT_COMMITTER_{NAME,EMAIL} environment variables or using "-c
user.{name,email}" command line options. I.e. the full command would become
something like

        $ GIT_COMMITTER_NAME="Greg Chicares" address@hidden git am 
--committer-date-is-author-date patch

 Just out of curiosity, have you been able to understand what happened in
order to produce the "Patch file format not recognized" error before?

VZ