mike@xxxxxxxxxxxxx wrote on Tue, 26 Jun 2012 01:07 -0400: > Well, "Jobs:" is the only thing I use. Everything else is filled in > automatically by git-p4. > > Yeah, so "Jobs:" appears once on a line by itself, and then multiple > lines tabbed in of whatever the Job ids are, in our case they are JIRA > issue numbers. So, it might look like: > > Jobs: > PROJECTNAME-123 > PROJECTNAME-456 > > I think that if someone is using git-p4 and they have "Jobs:" at the > beginning of a line by itself in a git commit message, then it is safe > to stop pre-pending tabs to the lines from there on. It can also be > an option to turn this behavior on. I agree that it is simpler to explain if Jobs: must come last. For the option, I'd prefer not to add another one, and instead hope that it's unlikely to find such a construct in a commit message that does not want this feature to happen. I coded it up already, but with a couple little differences. Once I get a couple more of the series on which it depends mailed out, I'll send it along for you to play with. -- Pete > On Sun, Jun 24, 2012 at 4:24 PM, Pete Wyckoff <pw@xxxxxxxx> wrote: > > mike@xxxxxxxxxxxxx wrote on Fri, 22 Jun 2012 12:15 -0400: > >> I've written a git prepare-commit-msg hook to do what the Perforce > >> JobsView would essentially do, so I can include the jobs directly in > >> my git commit message, and then use git-p4.skipSubmitEdit=true, so I > >> can just push things into Perforce directly from git without ever > >> being prompted by Perforce. > >> > >> Problem is that this doesn't work, because git-p4 tabs in the entire > >> commit message to put it in the "Description:" section of the Perforce > >> changelist, and my "Jobs:" ends up tabbed in, and it it required by > >> Perforce to be at the beginning of the line. The submit ends up > >> failing, because "Jobs:" is required. I am forced to turn off > >> skipSubmitEdit and edit the message to remove the tab from the "Jobs:" > >> line each commit. > >> > >> Is there any option to make this work right, or does the git-p4 not > >> support this? > > > > This is a great idea, and something I've thought would be useful > > too. There's no code to handle it currently, but it shouldn't be > > too hard. > > > > I'm imagining that special strings in the git commit are hoisted > > up out of the description when building the p4 change message, > > as you describe. Are there any more than "Jobs:"? Is it just > > a single instance that might appear? > > > > An easy way to do this is to change prepareLogMessage to alter > > or add a Jobs line. Unless we decide this needs to be more > > general. > > > > -- Pete > -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html