{"thread":{"id":"32480","subject":"[PATCH 2/2] Provide better guidance for submitting patches against git-gui, gitk","startedAt":"2012-12-30T18:18:53Z","lastAt":"2012-12-31T18:32:22Z","messageCount":7,"participants":["Jason Holden","Junio C Hamano","Thomas Ackermann"],"isPatch":true,"patchVersion":1,"patchTotal":2},"messages":[{"id":"205682","messageId":"1356891535-5647-1-git-send-email-jason.k.holden.swdev@gmail.com","threadId":"32480","inReplyTo":null,"subject":"[PATCH 0/2] Add MAINTAINERS file and clarify gui workflows","fromName":"Jason Holden","fromEmail":"jason.k.holden.swdev@gmail.com","sentAt":"2012-12-30T18:18:53Z","receivedAt":"2012-12-30T18:18:53Z","isPatch":true,"sender":{"key":"jason.k.holden.swdev@gmail.com","avatar":null},"body":"I spent a good amount of time yesterday figuring out the correct workflow\nto submit a change to gitk. As I understand it, gitk (and I think git-gui)\nare maintained upstream of git, and patches should be sent to the git email\nlist against the upstream repo. I think a top-level MAINTAINERS file would \nhelp new contributers like me get orientated, especially in the cases of these\nupstream projects that require a somewhat non-standard workflow\n\nI also added some additional clarifications to SubmittingPatches that \nclarifies the additional steps required to submit patches against the guis.\n\nPlease double check that I've got the correct email addresses and canonical\nrepositories\n\nI'm guessing there are additional Maintainers who should be added to the \nMAINTAINERS file, I just haven't followed to email list closely enough to\nknow all the formal/informal workflows that should be observed.\n\nJason Holden (2):\n Add top-level maintainers file with email/canonical repository\n information\n Provide better guidance for submitting patches against git-gui, gitk\n\n Documentation/SubmittingPatches | 11 +++++++++++\n MAINTAINERS | 17 +++++++++++++++++\n 2 files changed, 28 insertions(+)\n create mode 100644 MAINTAINERS\n\n-- \n1.8.1.rc3.28.g0ab5d1f\n"},{"id":"205681","messageId":"1356891535-5647-2-git-send-email-jason.k.holden.swdev@gmail.com","threadId":"32480","inReplyTo":"1356891535-5647-1-git-send-email-jason.k.holden.swdev@gmail.com","subject":"[PATCH 1/2] Add top-level maintainers file with email/canonical repository information","fromName":"Jason Holden","fromEmail":"jason.k.holden.swdev@gmail.com","sentAt":"2012-12-30T18:18:54Z","receivedAt":"2012-12-30T18:18:54Z","isPatch":true,"sender":{"key":"jason.k.holden.swdev@gmail.com","avatar":null},"body":"Certain parts of git have a semi-formalized workflow for\nincoming patches. This file documents the maintainers, their area of\nspecialization, their email address, and their canonical repository against\nwhich patches should be submitted.\n\nSigned-off-by: Jason Holden \n---\n MAINTAINERS | 17 +++++++++++++++++\n 1 file changed, 17 insertions(+)\n create mode 100644 MAINTAINERS\n\ndiff --git a/MAINTAINERS b/MAINTAINERS\nnew file mode 100644\nindex 0000000..ed23b21\n--- /dev/null\n+++ b/MAINTAINERS\n@@ -0,0 +1,17 @@\n+Core Git/Overall Maintainer:\n+ Junio C Hamano \n+ git://git.kernel.org/pub/scm/git/git.git\n+\n+\n+The GUI's packaged with git (git-gui and gitk) are maintained \n+upstream of the core git repository. Their contact information \n+and canonical repositories are below. Patches to improve these utilities \n+should be made against the tree's referenced below\n+\n+gitk:\n+ Paul Mackerras \n+ git://ozlabs.org/~paulus/gitk\n+\n+git-gui:\n+ Pat Thoyts \n+ git://repo.or.cz/git-gui\n-- \n1.8.1.rc3.28.g0ab5d1f\n"},{"id":"205680","messageId":"1356891535-5647-3-git-send-email-jason.k.holden.swdev@gmail.com","threadId":"32480","inReplyTo":"1356891535-5647-1-git-send-email-jason.k.holden.swdev@gmail.com","subject":"[PATCH 2/2] Provide better guidance for submitting patches against git-gui, gitk","fromName":"Jason Holden","fromEmail":"jason.k.holden.swdev@gmail.com","sentAt":"2012-12-30T18:18:55Z","receivedAt":"2012-12-30T18:18:55Z","isPatch":true,"sender":{"key":"jason.k.holden.swdev@gmail.com","avatar":null},"body":"git-gui and gitk are maintained upstream of git. Document this, and the\nprocedure for submitting patches to these tools\n\nSigned-off-by: Jason Holden \n---\n Documentation/SubmittingPatches | 11 +++++++++++\n 1 file changed, 11 insertions(+)\n\ndiff --git a/Documentation/SubmittingPatches b/Documentation/SubmittingPatches\nindex 75935d5..b82d426 100644\n--- a/Documentation/SubmittingPatches\n+++ b/Documentation/SubmittingPatches\n@@ -58,6 +58,17 @@ Checklist (and a short version for the impatient):\n \t please test it first by sending email to yourself.\n \t- see below for instructions specific to your mailer\n \n+\tImproving the GUI's\n+\t- gitk and git-gui are maintained upstream of Git despite being \n+\t included in Git's git repository\n+\t- Patches should be made against the upstream gui repository, \n+\t and not against the version in Git's git repository\n+\t- The resulting patch should still be emailed for review\n+\t to the git mailing list (git@vger.kernel.org), cc'ing the \n+\t applicable gui maintainer\n+\t- Please see the MAINTAINER's file for the gui maintainer's contact \n+\t information and canonical repository location\n+\n Long version:\n \n I started reading over the SubmittingPatches document for Linux\n-- \n1.8.1.rc3.28.g0ab5d1f\n"},{"id":"205684","messageId":"7va9svffr4.fsf@alter.siamese.dyndns.org","threadId":"32480","inReplyTo":"1356891535-5647-1-git-send-email-jason.k.holden.swdev@gmail.com","subject":"Re: [PATCH 0/2] Add MAINTAINERS file and clarify gui workflows","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2012-12-30T20:26:39Z","receivedAt":"2012-12-30T20:26:39Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jason Holden writes:\n\n> I spent a good amount of time yesterday figuring out the correct workflow\n> to submit a change to gitk.\n\nThanks; I just realized that nothing in Documentation/ hierarchy\nmentions these; they are only mentioned in \"A Note from the\nMaintainer\" I send out every once in a while (kept in MaintNotes of\n'todo' branch):\n\n * Other people's trees, trusted lieutenants and credits.\n\n Documentation/SubmittingPatches outlines to whom your proposed changes\n should be sent. As described in contrib/README, I would delegate fixes\n and enhancements in contrib/ area to the primary contributors of them.\n\n Although the following are included in git.git repository, they have their\n own authoritative repository and maintainers:\n\n - git-gui/ comes from git-gui project, maintained by Pat Thoyts:\n\n git://repo.or.cz/git-gui.git\n\n - gitk-git/ comes from Paul Mackerras's gitk project:\n\n git://ozlabs.org/~paulus/gitk\n\n - po/ comes from the localization coordinator, Jiang Xin:\n\n https://github.com/git-l10n/git-po/\n\nPerhaps the update should mention po/ as well?\n"},{"id":"205693","messageId":"loom.20121231T103639-635@post.gmane.org","threadId":"32480","inReplyTo":"7va9svffr4.fsf@alter.siamese.dyndns.org","subject":"Re: [PATCH 0/2] Add MAINTAINERS file and clarify gui workflows","fromName":"Thomas Ackermann","fromEmail":"th.acker@arcor.de","sentAt":"2012-12-31T09:40:19Z","receivedAt":"2012-12-31T09:40:19Z","isPatch":true,"sender":{"key":"th.acker@arcor.de","avatar":"https://avatars.githubusercontent.com/u/1358536?v=4"},"body":"Junio C Hamano pobox.com> writes:\n\n> \n> Thanks; I just realized that nothing in Documentation/ hierarchy\n> mentions these; they are only mentioned in \"A Note from the\n> Maintainer\" I send out every once in a while (kept in MaintNotes of\n> 'todo' branch):\n> \n\nWouldn't it be a good idea to put MaintNotes somewhere below ./Documentation?\n\n---\nThomas\n"},{"id":"205699","messageId":"20121231182229.GA8665@gmail.com","threadId":"32480","inReplyTo":"loom.20121231T103639-635@post.gmane.org","subject":"Re: [PATCH 0/2] Add MAINTAINERS file and clarify gui workflows","fromName":"Jason Holden","fromEmail":"jason.k.holden.swdev@gmail.com","sentAt":"2012-12-31T18:22:29Z","receivedAt":"2012-12-31T18:22:29Z","isPatch":true,"sender":{"key":"jason.k.holden.swdev@gmail.com","avatar":null},"body":"On Mon, Dec 31, 2012 at 09:40:19AM +0000, Thomas Ackermann wrote:\n> Junio C Hamano pobox.com> writes:\n> \n> > \n> > Thanks; I just realized that nothing in Documentation/ hierarchy\n> > mentions these; they are only mentioned in \"A Note from the\n> > Maintainer\" I send out every once in a while (kept in MaintNotes of\n> > 'todo' branch):\n> > \n> \n> Wouldn't it be a good idea to put MaintNotes somewhere below ./Documentation?\n> \n> ---\n> Thomas\n\nPutting it in Documentation/ would add one more outlier file (Along w/\nSubmittingPatches and CodingGuidelines). Documentation/technical seems\ntoo deep. I've got a patch that incorporates the content into the\nexisting README, but that seems a bit out of place, as the previous content of\nREADME was primarily pointers to other docs.\n\nWhat about a README.developers at the toplevel?\n"},{"id":"205701","messageId":"7vlicedqdl.fsf@alter.siamese.dyndns.org","threadId":"32480","inReplyTo":"loom.20121231T103639-635@post.gmane.org","subject":"Re: [PATCH 0/2] Add MAINTAINERS file and clarify gui workflows","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2012-12-31T18:32:22Z","receivedAt":"2012-12-31T18:32:22Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Thomas Ackermann writes:\n\n>> Thanks; I just realized that nothing in Documentation/ hierarchy\n>> mentions these; they are only mentioned in \"A Note from the\n>> Maintainer\" I send out every once in a while (kept in MaintNotes of\n>> 'todo' branch):\n>\n> Wouldn't it be a good idea to put MaintNotes somewhere below ./Documentation?\n\nPerhaps. It started as a living document that discusses the state\nof affairs as of the time of posting (there are mentions to \"the\nmost recent such release was ...\", etc), and because I wanted to\nkeep it that way (and also I needed somewhere to keep track of it),\nI deliberately kept it outside the source tree.\n\nIt is an addendum to howto-maintain-git, and what it covers overlaps\nwith it, so it will need some clean-ups if we want to go the route\nyou suggest.\n\nHaving said all that, I think it is still a good idea to keep the\noccasional \"A note from he Maintainer\" posting on list, and a\nversion that needs to rever to another document after losing\noverlaps with howto-maintain-git will no longer will be suitable\nsource for it, so...\n"}]}