Karl Berry wrote:
> But can I ask someone else
> to install it, please? Bruno? I have no faith in my ability to use git
> in expected ways.
Installing a patch into Gnulib is indeed a bit complicated, due to the
fact that we use a ChangeLog file and we try to use the same title and
message with git and in the ChangeLog.
Usually I proceed in these steps:
1. git pull
2. git status
Verify that my checkout is clean.
3. Save the patch attachment or, if it's a git-formatted mail, the
entire mail to a file.
4. git am < FILE
If that does not succeed because of a change of ChangeLog:
git am --abort
Edit FILE, to remove the ChangeLog change.
git am < FILE
5. gitk
Review the commit message's style and whether there is a ChangeLog change.
6. Add/tweak the ChangeLog entry to match the Gnulib style.
git commit --amend ChangeLog
Reuse the ChangeLog entry for the commit message.
If the patch was not produced by "git format-patch", do it the old way:
3'. Save the patch to a file.
4'. patch -p1 < FILE
5'. Add/tweak the ChangeLog entry to git the Gnulib style.
6'. git commit --author="FIRST LAST NAME <email@address>" .
Reuse the ChangeLog entry for the commit message.
7. gitk
Review again.
8. git push
Bruno
