Re: [PATCH v3 1/5] pull: rename pull.rename to pull.mode

2013-10-11 Thread Felipe Contreras
On Fri, Oct 11, 2013 at 11:40 PM, Richard Hansen wrote: > On 2013-10-11 22:08, Felipe Contreras wrote: >> I'm fine with 'echo "warning: foo" >&2', but still, if you really >> cared about consistency, there would be a warn() function > > So add one! It's only one simple line: > > warning() { p

Re: [PATCH v3 1/5] pull: rename pull.rename to pull.mode

2013-10-11 Thread Richard Hansen
On 2013-10-11 22:08, Felipe Contreras wrote: > I'm fine with 'echo "warning: foo" >&2', but still, if you really > cared about consistency, there would be a warn() function So add one! It's only one simple line: warning() { printf %s\\n "warning: $*" >&2; } So much discussion for something

Re: [PATCH v3 1/5] pull: rename pull.rename to pull.mode

2013-10-11 Thread Felipe Contreras
On Fri, Oct 11, 2013 at 8:25 PM, Jeff King wrote: > On Fri, Oct 11, 2013 at 08:15:46PM -0500, Felipe Contreras wrote: > >> >> You are free to go ahead and implement 'warning ()' in git-sh-setup.sh, >> >> in the >> >> meantime no shell script does that, and that's no reason to reject this >> >> p

Re: [PATCH v3 1/5] pull: rename pull.rename to pull.mode

2013-10-11 Thread Jeff King
On Fri, Oct 11, 2013 at 08:15:46PM -0500, Felipe Contreras wrote: > >> You are free to go ahead and implement 'warning ()' in git-sh-setup.sh, in > >> the > >> meantime no shell script does that, and that's no reason to reject this > >> patch > >> series. > > > > You are completely missing Matth

Re: [PATCH v3 1/5] pull: rename pull.rename to pull.mode

2013-10-11 Thread Felipe Contreras
On Fri, Oct 11, 2013 at 7:50 PM, Jeff King wrote: > On Fri, Oct 11, 2013 at 06:56:23PM -0500, Felipe Contreras wrote: > >> > >>> > These deprecation warning messages should be written to stderr, and >> > >>> > should probably be prefixed with "WARNING: ". >> > >>> >> > >>> Is there any deprecation

Re: [PATCH v3 1/5] pull: rename pull.rename to pull.mode

2013-10-11 Thread Jeff King
On Fri, Oct 11, 2013 at 06:56:23PM -0500, Felipe Contreras wrote: > > >>> > These deprecation warning messages should be written to stderr, and > > >>> > should probably be prefixed with "WARNING: ". > > >>> > > >>> Is there any deprecation warning that works this way? > > >> > > >> The ones in C

Re: [PATCH v3 1/5] pull: rename pull.rename to pull.mode

2013-10-11 Thread Richard Hansen
On 2013-10-11 19:56, Felipe Contreras wrote: > Matthieu Moy wrote: >> Felipe Contreras writes: >> >>> On Mon, Sep 9, 2013 at 9:21 PM, Jeff King wrote: On Mon, Sep 09, 2013 at 05:49:36PM -0500, Felipe Contreras wrote: >> These deprecation warning messages should be written to stderr,

Re: [PATCH v3 1/5] pull: rename pull.rename to pull.mode

2013-10-11 Thread Felipe Contreras
Matthieu Moy wrote: > Felipe Contreras writes: > > > On Mon, Sep 9, 2013 at 9:21 PM, Jeff King wrote: > >> On Mon, Sep 09, 2013 at 05:49:36PM -0500, Felipe Contreras wrote: > >> > >>> > These deprecation warning messages should be written to stderr, and > >>> > should probably be prefixed with "

Re: [PATCH v3 1/5] pull: rename pull.rename to pull.mode

2013-10-11 Thread Felipe Contreras
Richard Hansen wrote: > On 2013-09-09 18:49, Felipe Contreras wrote: > > On Mon, Sep 9, 2013 at 4:23 PM, Richard Hansen wrote: > >> On 2013-09-08 21:23, Felipe Contreras wrote: > >>> The old configurations still work, but get deprecated. > >> > >> Should some tests for the deprecated configs be ad

Re: [PATCH v3 1/5] pull: rename pull.rename to pull.mode

2013-09-19 Thread Richard Hansen
On 2013-09-09 18:49, Felipe Contreras wrote: > On Mon, Sep 9, 2013 at 4:23 PM, Richard Hansen wrote: >> On 2013-09-08 21:23, Felipe Contreras wrote: >>> The old configurations still work, but get deprecated. >> >> Should some tests for the deprecated configs be added? We wouldn't want >> to accid

Re: [PATCH v3 1/5] pull: rename pull.rename to pull.mode

2013-09-10 Thread Junio C Hamano
Felipe Contreras writes: > Also 'branch..rebase' to 'branch..pullmode'. > > This way 'pull.mode' can be set to 'merge', and the default can be > something else. > > The old configurations still work, but get deprecated. Sounds good, but we should still mention these old names in the documentatio

Re: [PATCH v3 1/5] pull: rename pull.rename to pull.mode

2013-09-10 Thread Matthieu Moy
Felipe Contreras writes: > On Mon, Sep 9, 2013 at 9:21 PM, Jeff King wrote: >> On Mon, Sep 09, 2013 at 05:49:36PM -0500, Felipe Contreras wrote: >> >>> > These deprecation warning messages should be written to stderr, and >>> > should probably be prefixed with "WARNING: ". >>> >>> Is there any d

Re: [PATCH v3 1/5] pull: rename pull.rename to pull.mode

2013-09-09 Thread Jeff King
On Tue, Sep 10, 2013 at 01:46:27AM -0500, Felipe Contreras wrote: > On Mon, Sep 9, 2013 at 9:21 PM, Jeff King wrote: > > On Mon, Sep 09, 2013 at 05:49:36PM -0500, Felipe Contreras wrote: > > > >> > These deprecation warning messages should be written to stderr, and > >> > should probably be prefi

Re: [PATCH v3 1/5] pull: rename pull.rename to pull.mode

2013-09-09 Thread Felipe Contreras
On Mon, Sep 9, 2013 at 9:21 PM, Jeff King wrote: > On Mon, Sep 09, 2013 at 05:49:36PM -0500, Felipe Contreras wrote: > >> > These deprecation warning messages should be written to stderr, and >> > should probably be prefixed with "WARNING: ". >> >> Is there any deprecation warning that works this

Re: [PATCH v3 1/5] pull: rename pull.rename to pull.mode

2013-09-09 Thread Jeff King
On Mon, Sep 09, 2013 at 05:49:36PM -0500, Felipe Contreras wrote: > > These deprecation warning messages should be written to stderr, and > > should probably be prefixed with "WARNING: ". > > Is there any deprecation warning that works this way? The ones in C code typically use warning(), which

Re: [PATCH v3 1/5] pull: rename pull.rename to pull.mode

2013-09-09 Thread Felipe Contreras
On Mon, Sep 9, 2013 at 4:23 PM, Richard Hansen wrote: > On 2013-09-08 21:23, Felipe Contreras wrote: >> The old configurations still work, but get deprecated. > > Should some tests for the deprecated configs be added? We wouldn't want > to accidentally break those. Probably, but Junio is not pic

Re: [PATCH v3 1/5] pull: rename pull.rename to pull.mode

2013-09-09 Thread Richard Hansen
On 2013-09-08 21:23, Felipe Contreras wrote: > The old configurations still work, but get deprecated. Should some tests for the deprecated configs be added? We wouldn't want to accidentally break those. > diff --git a/Documentation/config.txt b/Documentation/config.txt > index ec57a15..9489a59 1

[PATCH v3 1/5] pull: rename pull.rename to pull.mode

2013-09-08 Thread Felipe Contreras
Also 'branch..rebase' to 'branch..pullmode'. This way 'pull.mode' can be set to 'merge', and the default can be something else. The old configurations still work, but get deprecated. Signed-off-by: Felipe Contreras --- Documentation/config.txt | 22 +++--- Documentation/git-p