stpeter, hi, any possibility to pull XEP-0277? (or may I send it to you through email?)
Tobiashas left
stpeter
oh, I got an error when I followed Kev's instructions
stpeter
but sure, email it to stpeter @ stpeter.im
Kev
It's probably easier for Peter to apply it if you send it via email after formatting with `git format-patch`.
Vanaryon
stpeter, I found strange it wasn't pulled, that's why I ping you now ;)
Vanaryon
okay, will mail it
stpeter
k
Vanaryon
thanks ;)
Kev
stpeter: To apply a mailed patch, easiest is just to view source, select all, copy, and in a terminal run `pbpaste | git am` and the patch will be ready applied.
stpeter
thanks for the tip :)
Vanaryon
done
Kev
You can also save the email and git am /path/to/mail
stpeter
save the mail, or just the attachment?
stpeter
I saved the attachment and got this:
$ git am ~/Desktop/xep-0277.xml
Patch format detection failed.
Kev
If the mail is sent correctly, the whole mail is what you apply.
stpeter
ah ok
Kev
Feel free to forward to me to check.
stpeter
now I get:
$ git am ~/Desktop/xep-0277.eml
Patch is empty. Was it split wrong?
stpeter
:)
Kev
Forward and I can look :)
stpeter
ok
stpeter
it is pgp-signed, so it's got to be some kind of multipart mime insanity :)
Vanaryon
stpeter, do you want me to send it back without any pgp ?
Kev
Vanaryon: Are you generating it correctly with git format-patch, and then sending with git send-email?
Vanaryon
Kev, nope, I sent it from Evolution, my mail client
Kev
Ok, so you send the format-patch output as an attachment to a mail?
Vanaryon
I try with git format-patch
Vanaryon
nope
Kev
That will work fine too, it just means Peter has to apply the attachment instead of the whole mail.
Kev
But formatting the patch is necessary whichever way.
Vanaryon
Mhh I don't really understand how to proceed, git send-email does not exits
Vanaryon
*-s
Kev
Then just use format-patch to create the patch, and send it to Peter as an attachment.
Kev
It's the format-patch bit that's the important part.
stpeter
sorry, I got interrupted here IRL, brb
Vanaryon
mhh, git format-patch returns me 0 bytes after stdout
Tobiashas left
Kev
Are you sure you're running it correctly?
Kev
It should be dumping the patches you ask it to files and then telling you what it did on stdout.
Vanaryon
the problem is that I pushed the commit this morning to my repo.
Vanaryon
So there's nothing to patch, according to git
Kev
So what command are you running?
Vanaryon
only git format-patch, in the root of the repositery
Kev
I think the manpage tells you you can't do that :p
Kev
DESCRIPTION
Prepare each commit with its patch in one file per commit, formatted to
resemble UNIX mailbox format. The output of this command is convenient
for e-mail submission or for use with git am.
There are two ways to specify which commits to operate on.
1. A single commit, <since>, specifies that the commits leading to the
tip of the current branch that are not in the history that leads to
the <since> to be output.
2. Generic <revision range> expression (see "SPECIFYING REVISIONS"
section in gitrevisions(7)) means the commits in the specified
range.
Kev
So
git format-patch HEAD\^
will give you a file that Peter can apply for the topmost commit in your tree.
Kev
git format-patch xsf/master
will give you patches for every commit in your tree that isn't in the 'master' branch on the 'xsf' remote (if you've set one up)
Vanaryon
I got it
Vanaryon
okay, downloading xsf:master rep.
Vanaryon
mhh I can't get it
Vanaryon
Maybe is it simpler if stpeter update it by pasting the xep-0277.xml file?
Kev
How many commits is it?
Kev
(That you want him to push)
Vanaryon
3
Kev
Then
git format-patch HEAD\~3
should sort it out.
Vanaryon
done :)
Kev
Attach those to a mail to Peter.
stpetersighs over standards@ traffic
Kev
Peter can then save the three attachments, run
git am /path/to/attachments
and all will be well with the world.
Vanaryon
stpeter, I mail you the three patch files?
stpeter
yes please
Vanaryon
done
stpeter
received
stpeter
gotta love git error messages:
$ git am ~/Documents/tmp/patches/
previous rebase directory /Users/stpeter/Documents/git/xmpp/.git/rebase-apply still exists but mbox given.
Kev
Sorry.
Kev
You're in the middle of a failed git am aren't you?
Kev
Try something like
git am --abort
stpeter
perchance
Kev
It should have given you some warning about this on the previous run, but maybe it decided not to.
stpeter
ok seems to have worked now
stpeterchecks
stpeter
but I'm changing 0.2.1 and 0.2.2 to 0.3 :)
Kev
Hmm?
stpeter
in the spec
stpeter
we don't really use the minor version numbers
Kev
So it's a problem with the submitted patch, rather than that Git has screwed up, right?
stpeter
right
stpeter
sorry
stpeter
wasn't clear
Kev
Oh, well, want to see a neat trick, then? :)
stpeter
I do!
Kev
You can
git rebase -i origin/master
Kev
That'll let you rewrite all the history that's occured since the HEAD of origin/master (assuming you've already done a `git fetch`)
Kev
So you could squash the three patches together, for example, and not have a record of the interim steps.
Kev
And, indeed, modify the patches while keeping the author etc. intact if you so wish to edit the version numbers but leave the substance intact.
stpeter
ok, XEP-0277 updated and announced
Vanaryon
thanks :)
stpeter
no, thank you!
Vanaryon
We have added everything we saw from microblogging specs drafts of buddycloud and us :)
Vanaryon
this may be enough for the moment ;)
Vanaryon
Thanks a lot for your help stpeter and Kev, and your work ;)
Vanaryon
Leave, have a good evening (or afternoon in the US? :) )