{"thread":{"id":"3375","subject":"stGIT: commit vs export vs mail","startedAt":"2006-02-17T21:09:48Z","lastAt":"2006-02-18T08:30:06Z","messageCount":4,"participants":["Jesse Brandeburg","Catalin Marinas"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"16338","messageId":"Pine.WNT.4.63.0602171139020.3052@jbrandeb-desk.amr.corp.intel.com","threadId":"3375","inReplyTo":null,"subject":"stGIT: commit vs export vs mail","fromName":"Jesse Brandeburg","fromEmail":"jesse.brandeburg@intel.com","sentAt":"2006-02-17T21:09:48Z","receivedAt":"2006-02-17T21:09:48Z","isPatch":false,"sender":{"key":"jesse.brandeburg@intel.com","avatar":null},"body":"So I am using stgit .8 right now, and I'm having a hard time figuring out \nwhat the correct workflow should be for using stg and then committing a \nchange\n\nHere is what I've been doing:\nstg new test\n enter my short description on first line\n enter my long description on next lines.\nvi file\nstg refresh\nstg mail \nor\nstg commit\n\nProblem that I'm having right now is that the templates do the right thing \nfor mail, but, the commit only puts in the \"enter my...\" text.\n\nIs there a template based way to automatically append the author in the \nSigned-off-by: line when i do stg commit?\n\nI realize that I could put Signed-off-by in the log by hand (or even in \n.git/patchdescr.tmpl which i just found) but it would be cool if the \ncommit just had something like patchmail.tmpl (maybe call it \ncommitdescr.tmpl or something?)\n\nthanks for any opinions or instruction.\n\nJesse\n"},{"id":"16345","messageId":"43F64A51.10607@gmail.com","threadId":"3375","inReplyTo":"Pine.WNT.4.63.0602171139020.3052@jbrandeb-desk.amr.corp.intel.com","subject":"Re: stGIT: commit vs export vs mail","fromName":"Catalin Marinas","fromEmail":"catalin.marinas@gmail.com","sentAt":"2006-02-17T22:12:33Z","receivedAt":"2006-02-17T22:12:33Z","isPatch":false,"sender":{"key":"catalin.marinas@gmail.com","avatar":null},"body":"Jesse Brandeburg wrote:\n> So I am using stgit .8 right now, and I'm having a hard time figuring\n> out what the correct workflow should be for using stg and then\n> committing a change\n> \n> Here is what I've been doing:\n> stg new test\n> enter my short description on first line\n> enter my long description on next lines.\n> vi file\n> stg refresh\n> stg mail \n> or\n> stg commit\n\nThere is no \"or\" above but only \"and maybe\". The 'commit' command is\nonly used to permanently store a set of patches into the repository.\nAfter that, you should not be able to change them anymore (well, someone\njust sent me a patch for an uncommit command). I only use this command\nwhen I work in the \"maintainer\" mode on StGIT. For contributing patches,\nyou shouldn't need it since the base of the stack should usually be\nidentical to the HEAD of the remote repository.\n\n> Problem that I'm having right now is that the templates do the right\n> thing for mail, but, the commit only puts in the \"enter my...\" text.\n\nI don't fully understand this. Where does commit put the \"enter my...\" text?\n\n> Is there a template based way to automatically append the author in the\n> Signed-off-by: line when i do stg commit?\n\nThis can only be done when creating a patch. Commit doesn't modify the\npatches. I think you slightly misunderstood the commit command.\n\nCatalin\n"},{"id":"16353","messageId":"Pine.WNT.4.63.0602171802030.2172@jbrandeb-desk.amr.corp.intel.com","threadId":"3375","inReplyTo":"43F64A51.10607@gmail.com","subject":"Re: stGIT: commit vs export vs mail","fromName":"Jesse Brandeburg","fromEmail":"jesse.brandeburg@intel.com","sentAt":"2006-02-18T02:11:34Z","receivedAt":"2006-02-18T02:11:34Z","isPatch":false,"sender":{"key":"jesse.brandeburg@intel.com","avatar":null},"body":"On Fri, 17 Feb 2006, Catalin Marinas wrote:\n> Jesse Brandeburg wrote:\n>> So I am using stgit .8 right now, and I'm having a hard time figuring\n>> out what the correct workflow should be for using stg and then\n>> committing a change\n>>\n>> Here is what I've been doing:\n>> stg new test\n>> enter my short description on first line\n>> enter my long description on next lines.\n>> vi file\n>> stg refresh\n>> stg mail \n>> or\n>> stg commit\n>\n> There is no \"or\" above but only \"and maybe\". The 'commit' command is\n> only used to permanently store a set of patches into the repository.\n> After that, you should not be able to change them anymore (well, someone\n> just sent me a patch for an uncommit command). I only use this command\n> when I work in the \"maintainer\" mode on StGIT. For contributing patches,\n> you shouldn't need it since the base of the stack should usually be\n> identical to the HEAD of the remote repository.\n\nI'm trying to commit changes to a local repository so that the maintainer \ncan do a \"pull\" off of my repository.\n\n>> Problem that I'm having right now is that the templates do the right\n>> thing for mail, but, the commit only puts in the \"enter my...\" text.\n>\n> I don't fully understand this. Where does commit put the \"enter my...\" text?\n\nso I used stgit to commit this change. It puts it in the git log of \ncheckins for the repository.\n\n[jbrandeb@lindenhurst-2 e1000]$ git log | head -n 20\n\ncommit fb16b7111dae51b9a928aa7706d1cc022df8741d\nAuthor: Jesse Brandeburg \nDate: Fri Feb 17 11:29:19 2006 -0800\n\n e1000: update readme\n Update the e1000 text to the latest version\n\n Signed-off-by: Jesse Brandeburg \n\n>> Is there a template based way to automatically append the author in the\n>> Signed-off-by: line when i do stg commit?\n>\n> This can only be done when creating a patch. Commit doesn't modify the\n> patches. I think you slightly misunderstood the commit command.\n\nthe stgit command stg commit freezes patches that I've made into my \nrepository. I think I get that, but I've been wrong before. Its just \nthat I can template the Signed-off-by: line for emails, but when I do a \nstg commit I want the thing to have the Signed-off-by: line in the commit \ntext (like above where I added it by hand)\n\nI guess I'll just change my templates to not auto add the Signed-off-by \nline and then things will work okay, as I'll just add the line during stg \nnew ...\n\nThanks for your reply, and the cool tool!\n\nJesse\n"},{"id":"16371","messageId":"b0943d9e0602180030i1f7b71eco@mail.gmail.com","threadId":"3375","inReplyTo":"Pine.WNT.4.63.0602171802030.2172@jbrandeb-desk.amr.corp.intel.com","subject":"Re: stGIT: commit vs export vs mail","fromName":"Catalin Marinas","fromEmail":"catalin.marinas@gmail.com","sentAt":"2006-02-18T08:30:06Z","receivedAt":"2006-02-18T08:30:06Z","isPatch":false,"sender":{"key":"catalin.marinas@gmail.com","avatar":null},"body":"On 18/02/06, Jesse Brandeburg wrote:\n> On Fri, 17 Feb 2006, Catalin Marinas wrote:\n> > Jesse Brandeburg wrote:\n> >> stg mail \n> >> or\n> >> stg commit\n> >\n>\n> I'm trying to commit changes to a local repository so that the maintainer\n> can do a \"pull\" off of my repository.\n\nAll the applied patches in your repository are visible via HEAD. There\nis no need to do a commit, unless you want to store them permanently.\nThe way of using StGIT in contributor mode is to always have the base\nof the stack identical to the HEAD of the upstream repository.\n\nI usually just mail the patches but the other way would be to apply\nthe patches you want to be merged and ask the maintainer to pull from\nit. Once the changes were pulled, you could run 'stg pull' on your\nrepository and StGIT should detect which patches were merged and\nwhether there are any conflicts (patches modified upstream for\nexample).\n\nIf you want to continue the work on your branch before the maintainer\nwould pull the changes, you can create a separate \"stable\" branch for\nthis. Either use 'stg branch --clone' or simply create it with 'stg\nbranch --create base' and pick the patches you want merged.\n\n> the stgit command stg commit freezes patches that I've made into my\n> repository. I think I get that, but I've been wrong before. Its just\n> that I can template the Signed-off-by: line for emails, but when I do a\n> stg commit I want the thing to have the Signed-off-by: line in the commit\n> text (like above where I added it by hand)\n>\n> I guess I'll just change my templates to not auto add the Signed-off-by\n> line and then things will work okay, as I'll just add the line during stg\n> new ...\n\nI got it now. You added Signed-off-by to the mail template. As I said\nabove, commit should not be used to facilitate the maintainer pulling.\nIt is already available since the patches are valid GIT commits.\n\n--\nCatalin\n"}]}