As I reported on the mailing list: - sssd.conf man page does not include "autofs" and "ssh" as supported services. https://fedorahosted.org/sssd/ticket/1183 - sssd-ldap.conf man page should have "not set" instead of "none" as a default for the directive ldap_sasl_mech. https://fedorahosted.org/sssd/ticket/1180
Considered these are my first patches, I ask you to report to me everything I made wrong or possibly-doable-better so I can improve for future patches :-)
Thanks Marco
On Sun, Feb 12, 2012 at 12:29:36PM +0100, Marco Pizzoli wrote:
As I reported on the mailing list:
- sssd.conf man page does not include "autofs" and "ssh" as supported
services. https://fedorahosted.org/sssd/ticket/1183
- sssd-ldap.conf man page should have "not set" instead of "none" as a
default for the directive ldap_sasl_mech. https://fedorahosted.org/sssd/ticket/1180
Considered these are my first patches, I ask you to report to me everything I made wrong or possibly-doable-better so I can improve for future patches :-)
Thanks Marco
Thank you very much for your contribution, Marco!
The first part is OK, but can you wrap the ssh part with a "with_ssh" condition the way sudo and autofs are? Something like:
+ <phrase condition="with_ssh">, ssh</phrase>
This is done in order to only include the ssh specific documentation when SSSD is configured with the "--with-ssh" switch.
On Mon, Feb 13, 2012 at 12:31 PM, Jakub Hrozek jhrozek@redhat.com wrote:
On Sun, Feb 12, 2012 at 12:29:36PM +0100, Marco Pizzoli wrote:
As I reported on the mailing list:
- sssd.conf man page does not include "autofs" and "ssh" as supported
services. https://fedorahosted.org/sssd/ticket/1183
- sssd-ldap.conf man page should have "not set" instead of "none" as a
default for the directive ldap_sasl_mech. https://fedorahosted.org/sssd/ticket/1180
Considered these are my first patches, I ask you to report to me everything I made wrong or possibly-doable-better so I can improve for future patches :-)
Thanks Marco
Thank you very much for your contribution, Marco!
The first part is OK, but can you wrap the ssh part with a "with_ssh" condition the way sudo and autofs are? Something like:
<phrase condition="with_ssh">, ssh</phrase>This is done in order to only include the ssh specific documentation when SSSD is configured with the "--with-ssh" switch.
Hi, Ok, I understand and agree.
Now it's time for a second lesson of git :-) How can I correct the patch? What steps do I have to follow? re-clone from scratch? Editing the file again produce me a diff with modified only one file...
Thanks Marco
On Mon, 2012-02-13 at 13:40 +0100, Marco Pizzoli wrote:
On Mon, Feb 13, 2012 at 12:31 PM, Jakub Hrozek jhrozek@redhat.com wrote: On Sun, Feb 12, 2012 at 12:29:36PM +0100, Marco Pizzoli wrote: > As I reported on the mailing list: > - sssd.conf man page does not include "autofs" and "ssh" as supported > services. https://fedorahosted.org/sssd/ticket/1183 > - sssd-ldap.conf man page should have "not set" instead of "none" as a > default for the directive ldap_sasl_mech. > https://fedorahosted.org/sssd/ticket/1180 > > Considered these are my first patches, I ask you to report to me > everything I made wrong or possibly-doable-better so I can improve for > future patches :-) > > Thanks > Marco
Thank you very much for your contribution, Marco! The first part is OK, but can you wrap the ssh part with a "with_ssh" condition the way sudo and autofs are? Something like: + <phrase condition="with_ssh">, ssh</phrase> This is done in order to only include the ssh specific documentation when SSSD is configured with the "--with-ssh" switch.Hi, Ok, I understand and agree.
Now it's time for a second lesson of git :-) How can I correct the patch? What steps do I have to follow? re-clone from scratch? Editing the file again produce me a diff with modified only one file...
Modify the file. Then do a 'git add <file>'. Then instead of doing regular 'git commit', you can do 'git commit --amend'. This will add the changes you just made to the previous commit in the list. Now just 'git format-patch -M -C --patience --full-index -1' and you'll have a new patch with all of your changes.
This process gets a little trickier if you have made other patches and commits in the tree since the one you want to edit. In that case, you'll want to learn the "ins and outs" of 'git rebase -i', but that's a much longer lesson. If you get to a point where you need to do that, I recommend joining us on IRC so we can walk you through it for the first time. We hang around on #sssd on irc.freenode.net.
Hi, Ok, I understand and agree.
Now it's time for a second lesson of git :-) How can I correct the patch? What steps do I have to follow? re-clone from scratch? Editing the file again produce me a diff with modified only one file...
Modify the file. Then do a 'git add<file>'. Then instead of doing regular 'git commit', you can do 'git commit --amend'. This will add the changes you just made to the previous commit in the list. Now just 'git format-patch -M -C --patience --full-index -1' and you'll have a new patch with all of your changes.
This process gets a little trickier if you have made other patches and commits in the tree since the one you want to edit. In that case, you'll want to learn the "ins and outs" of 'git rebase -i', but that's a much longer lesson. If you get to a point where you need to do that, I recommend joining us on IRC so we can walk you through it for the first time. We hang around on #sssd on irc.freenode.net.
Also if you are interested in git, I suggest you to read Pro Git by Scott Chacon. It is a great book, available for free at http://progit.org/
The aforementioned problematic is described in section 7.4.
On Mon, 2012-02-13 at 13:58 +0100, Pavel Březina wrote:
Hi, Ok, I understand and agree.
Now it's time for a second lesson of git :-) How can I correct the patch? What steps do I have to follow? re-clone from scratch? Editing the file again produce me a diff with modified only one file...
Modify the file. Then do a 'git add<file>'. Then instead of doing regular 'git commit', you can do 'git commit --amend'. This will add the changes you just made to the previous commit in the list. Now just 'git format-patch -M -C --patience --full-index -1' and you'll have a new patch with all of your changes.
This process gets a little trickier if you have made other patches and commits in the tree since the one you want to edit. In that case, you'll want to learn the "ins and outs" of 'git rebase -i', but that's a much longer lesson. If you get to a point where you need to do that, I recommend joining us on IRC so we can walk you through it for the first time. We hang around on #sssd on irc.freenode.net.
Also if you are interested in git, I suggest you to read Pro Git by Scott Chacon. It is a great book, available for free at http://progit.org/
The aforementioned problematic is described in section 7.4.
Just to avoid confusion, Pavel meant to say "section 6.4".
Dne 13.2.2012 14:05, Stephen Gallagher napsal(a):
On Mon, 2012-02-13 at 13:58 +0100, Pavel Březina wrote:
Hi, Ok, I understand and agree.
Now it's time for a second lesson of git :-) How can I correct the patch? What steps do I have to follow? re-clone from scratch? Editing the file again produce me a diff with modified only one file...
Modify the file. Then do a 'git add<file>'. Then instead of doing regular 'git commit', you can do 'git commit --amend'. This will add the changes you just made to the previous commit in the list. Now just 'git format-patch -M -C --patience --full-index -1' and you'll have a new patch with all of your changes.
This process gets a little trickier if you have made other patches and commits in the tree since the one you want to edit. In that case, you'll want to learn the "ins and outs" of 'git rebase -i', but that's a much longer lesson. If you get to a point where you need to do that, I recommend joining us on IRC so we can walk you through it for the first time. We hang around on #sssd on irc.freenode.net.
Also if you are interested in git, I suggest you to read Pro Git by Scott Chacon. It is a great book, available for free at http://progit.org/
The aforementioned problematic is described in section 7.4.
Just to avoid confusion, Pavel meant to say "section 6.4".
No, I didn't :) In the version that is currently available is "7.4. Rewriting History".
On Mon, 2012-02-13 at 14:10 +0100, Pavel Březina wrote:
Dne 13.2.2012 14:05, Stephen Gallagher napsal(a):
On Mon, 2012-02-13 at 13:58 +0100, Pavel Březina wrote:
Hi, Ok, I understand and agree.
Now it's time for a second lesson of git :-) How can I correct the patch? What steps do I have to follow? re-clone from scratch? Editing the file again produce me a diff with modified only one file...
Modify the file. Then do a 'git add<file>'. Then instead of doing regular 'git commit', you can do 'git commit --amend'. This will add the changes you just made to the previous commit in the list. Now just 'git format-patch -M -C --patience --full-index -1' and you'll have a new patch with all of your changes.
This process gets a little trickier if you have made other patches and commits in the tree since the one you want to edit. In that case, you'll want to learn the "ins and outs" of 'git rebase -i', but that's a much longer lesson. If you get to a point where you need to do that, I recommend joining us on IRC so we can walk you through it for the first time. We hang around on #sssd on irc.freenode.net.
Also if you are interested in git, I suggest you to read Pro Git by Scott Chacon. It is a great book, available for free at http://progit.org/
The aforementioned problematic is described in section 7.4.
Just to avoid confusion, Pavel meant to say "section 6.4".
No, I didn't :) In the version that is currently available is "7.4. Rewriting History".
I'm looking at the web version here: http://progit.org/book/ Says 6.4 :)
Dne 13.2.2012 14:14, Stephen Gallagher napsal(a):
On Mon, 2012-02-13 at 14:10 +0100, Pavel Březina wrote:
Dne 13.2.2012 14:05, Stephen Gallagher napsal(a):
On Mon, 2012-02-13 at 13:58 +0100, Pavel Březina wrote:
Hi, Ok, I understand and agree.
Now it's time for a second lesson of git :-) How can I correct the patch? What steps do I have to follow? re-clone from scratch? Editing the file again produce me a diff with modified only one file...
Modify the file. Then do a 'git add<file>'. Then instead of doing regular 'git commit', you can do 'git commit --amend'. This will add the changes you just made to the previous commit in the list. Now just 'git format-patch -M -C --patience --full-index -1' and you'll have a new patch with all of your changes.
This process gets a little trickier if you have made other patches and commits in the tree since the one you want to edit. In that case, you'll want to learn the "ins and outs" of 'git rebase -i', but that's a much longer lesson. If you get to a point where you need to do that, I recommend joining us on IRC so we can walk you through it for the first time. We hang around on #sssd on irc.freenode.net.
Also if you are interested in git, I suggest you to read Pro Git by Scott Chacon. It is a great book, available for free at http://progit.org/
The aforementioned problematic is described in section 7.4.
Just to avoid confusion, Pavel meant to say "section 6.4".
No, I didn't :) In the version that is currently available is "7.4. Rewriting History".
I'm looking at the web version here: http://progit.org/book/ Says 6.4 :)
Alright, I used the pdf :) The web version is missing the introduction chapter :)
2012/2/13 Pavel Březina pbrezina@redhat.com
Dne 13.2.2012 14:14, Stephen Gallagher napsal(a):
On Mon, 2012-02-13 at 14:10 +0100, Pavel Březina wrote:
Dne 13.2.2012 14:05, Stephen Gallagher napsal(a):
On Mon, 2012-02-13 at 13:58 +0100, Pavel Březina wrote:
Hi,
> Ok, I understand and agree. > > Now it's time for a second lesson of git :-) > How can I correct the patch? What steps do I have to follow? > re-clone from scratch? Editing the file again produce me a diff with > modified only one file... >
Modify the file. Then do a 'git add<file>'. Then instead of doing regular 'git commit', you can do 'git commit --amend'. This will add the changes you just made to the previous commit in the list. Now just 'git format-patch -M -C --patience --full-index -1' and you'll have a new patch with all of your changes.
This process gets a little trickier if you have made other patches and commits in the tree since the one you want to edit. In that case, you'll want to learn the "ins and outs" of 'git rebase -i', but that's a much longer lesson. If you get to a point where you need to do that, I recommend joining us on IRC so we can walk you through it for the first time. We hang around on #sssd on irc.freenode.net.
Also if you are interested in git, I suggest you to read Pro Git by Scott Chacon. It is a great book, available for free at http://progit.org/
The aforementioned problematic is described in section 7.4.
Just to avoid confusion, Pavel meant to say "section 6.4".
No, I didn't :) In the version that is currently available is "7.4. Rewriting History".
I'm looking at the web version here: http://progit.org/book/ Says 6.4 :)
Alright, I used the pdf :) The web version is missing the introduction chapter :)
Ok, I will give it a look. Thanks Marco
On Mon, Feb 13, 2012 at 02:30:08PM +0100, Marco Pizzoli wrote:
2012/2/13 Pavel Bo/ezina pbrezina@redhat.com
Dne 13.2.2012 14:14, Stephen Gallagher napsal(a): On Mon, 2012-02-13 at 14:10 +0100, Pavel Bo/ezina wrote: Dne 13.2.2012 14:05, Stephen Gallagher napsal(a): On Mon, 2012-02-13 at 13:58 +0100, Pavel Bo/ezina wrote: Hi, Ok, I understand and agree. Now it's time for a second lesson of git :-) How can I correct the patch? What steps do I have to follow? re-clone from scratch? Editing the file again produce me a diff with modified only one file... Modify the file. Then do a 'git add<file>'. Then instead of doing regular 'git commit', you can do 'git commit --amend'. This will add the changes you just made to the previous commit in the list. Now just 'git format-patch -M -C --patience --full-index -1' and you'll have a new patch with all of your changes. This process gets a little trickier if you have made other patches and commits in the tree since the one you want to edit. In that case, you'll want to learn the "ins and outs" of 'git rebase -i', but that's a much longer lesson. If you get to a point where you need to do that, I recommend joining us on IRC so we can walk you through it for the first time. We hang around on #sssd on irc.freenode.net. Also if you are interested in git, I suggest you to read Pro Git by Scott Chacon. It is a great book, available for free at http://progit.org/ The aforementioned problematic is described in section 7.4. Just to avoid confusion, Pavel meant to say "section 6.4". No, I didn't :) In the version that is currently available is "7.4. Rewriting History". I'm looking at the web version here: http://progit.org/book/ Says 6.4 :) Alright, I used the pdf :) The web version is missing the introduction chapter :)Ok, I will give it a look. Thanks Marco
We're trying to get all translatable strings in place for the upcoming release so I went ahead and amended the original patch. The attribution still belongs to Marco of course -- thank you for the contribution!
On Tue, 2012-04-10 at 08:13 -0400, Jakub Hrozek wrote:
On Mon, Feb 13, 2012 at 02:30:08PM +0100, Marco Pizzoli wrote:
2012/2/13 Pavel Bo/ezina pbrezina@redhat.com
Dne 13.2.2012 14:14, Stephen Gallagher napsal(a): On Mon, 2012-02-13 at 14:10 +0100, Pavel Bo/ezina wrote: Dne 13.2.2012 14:05, Stephen Gallagher napsal(a): On Mon, 2012-02-13 at 13:58 +0100, Pavel Bo/ezina wrote: Hi, Ok, I understand and agree. Now it's time for a second lesson of git :-) How can I correct the patch? What steps do I have to follow? re-clone from scratch? Editing the file again produce me a diff with modified only one file... Modify the file. Then do a 'git add<file>'. Then instead of doing regular 'git commit', you can do 'git commit --amend'. This will add the changes you just made to the previous commit in the list. Now just 'git format-patch -M -C --patience --full-index -1' and you'll have a new patch with all of your changes. This process gets a little trickier if you have made other patches and commits in the tree since the one you want to edit. In that case, you'll want to learn the "ins and outs" of 'git rebase -i', but that's a much longer lesson. If you get to a point where you need to do that, I recommend joining us on IRC so we can walk you through it for the first time. We hang around on #sssd on irc.freenode.net. Also if you are interested in git, I suggest you to read Pro Git by Scott Chacon. It is a great book, available for free at http://progit.org/ The aforementioned problematic is described in section 7.4. Just to avoid confusion, Pavel meant to say "section 6.4". No, I didn't :) In the version that is currently available is "7.4. Rewriting History". I'm looking at the web version here: http://progit.org/book/ Says 6.4 :) Alright, I used the pdf :) The web version is missing the introduction chapter :)Ok, I will give it a look. Thanks Marco
We're trying to get all translatable strings in place for the upcoming release so I went ahead and amended the original patch. The attribution still belongs to Marco of course -- thank you for the contribution!
Ack.
On Wed, 2012-04-18 at 14:14 -0400, Stephen Gallagher wrote:
On Tue, 2012-04-10 at 08:13 -0400, Jakub Hrozek wrote:
On Mon, Feb 13, 2012 at 02:30:08PM +0100, Marco Pizzoli wrote:
2012/2/13 Pavel Bo/ezina pbrezina@redhat.com
Dne 13.2.2012 14:14, Stephen Gallagher napsal(a): On Mon, 2012-02-13 at 14:10 +0100, Pavel Bo/ezina wrote: Dne 13.2.2012 14:05, Stephen Gallagher napsal(a): On Mon, 2012-02-13 at 13:58 +0100, Pavel Bo/ezina wrote: Hi, Ok, I understand and agree. Now it's time for a second lesson of git :-) How can I correct the patch? What steps do I have to follow? re-clone from scratch? Editing the file again produce me a diff with modified only one file... Modify the file. Then do a 'git add<file>'. Then instead of doing regular 'git commit', you can do 'git commit --amend'. This will add the changes you just made to the previous commit in the list. Now just 'git format-patch -M -C --patience --full-index -1' and you'll have a new patch with all of your changes. This process gets a little trickier if you have made other patches and commits in the tree since the one you want to edit. In that case, you'll want to learn the "ins and outs" of 'git rebase -i', but that's a much longer lesson. If you get to a point where you need to do that, I recommend joining us on IRC so we can walk you through it for the first time. We hang around on #sssd on irc.freenode.net. Also if you are interested in git, I suggest you to read Pro Git by Scott Chacon. It is a great book, available for free at http://progit.org/ The aforementioned problematic is described in section 7.4. Just to avoid confusion, Pavel meant to say "section 6.4". No, I didn't :) In the version that is currently available is "7.4. Rewriting History". I'm looking at the web version here: http://progit.org/book/ Says 6.4 :) Alright, I used the pdf :) The web version is missing the introduction chapter :)Ok, I will give it a look. Thanks Marco
We're trying to get all translatable strings in place for the upcoming release so I went ahead and amended the original patch. The attribution still belongs to Marco of course -- thank you for the contribution!
Ack.
Pushed to master and sssd-1-8.
On Mon, 2012-02-13 at 07:49 -0500, Stephen Gallagher wrote:
Modify the file. Then do a 'git add <file>'. Then instead of doing regular 'git commit', you can do 'git commit --amend'. This will add the changes you just made to the previous commit in the list. Now just 'git format-patch -M -C --patience --full-index -1' and you'll have a new patch with all of your changes.
This process gets a little trickier if you have made other patches and commits in the tree since the one you want to edit. In that case, you'll want to learn the "ins and outs" of 'git rebase -i', but that's a much longer lesson.
git commit --fixup <commitid> is much simpler to explain for basica changes, then a normal git rebase (not interactive) will automatically merge in the right commit, and usual got format-patch
Simo.
If you get to a point where you need to do that, I recommend joining us on IRC so we can walk you through it for the first time. We hang around on #sssd on irc.freenode.net.
sssd-devel@lists.fedorahosted.org
-
Jakub Hrozek -
Marco Pizzoli -
Pavel Březina -
Simo Sorce -
Stephen Gallagher