* [PATCH 1/2]: amendment
@ 2006-06-08 15:22 Johannes Schindelin
2006-06-08 16:51 ` Junio C Hamano
2006-06-08 16:52 ` Junio C Hamano
0 siblings, 2 replies; 4+ messages in thread
From: Johannes Schindelin @ 2006-06-08 15:22 UTC (permalink / raw)
To: junkio, git
Hi,
I completely forgot that with a global config, it makes sense to have
aliases even if we are not in a git repository.
So, in git.c, handle_alias() the "if (nongit)" makes no sense any longer.
If I have to revise the patch anyway, I will include the change, but if
you decide to take it, please change that.
Ciao,
Dscho
P.S.: There might be other users (such as git-peek-remote) who want that
change, too.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 1/2]: amendment
2006-06-08 15:22 [PATCH 1/2]: amendment Johannes Schindelin
@ 2006-06-08 16:51 ` Junio C Hamano
2006-06-08 20:11 ` Johannes Schindelin
2006-06-08 16:52 ` Junio C Hamano
1 sibling, 1 reply; 4+ messages in thread
From: Junio C Hamano @ 2006-06-08 16:51 UTC (permalink / raw)
To: Johannes Schindelin; +Cc: git
Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
> I completely forgot that with a global config, it makes sense to have
> aliases even if we are not in a git repository.
>
> So, in git.c, handle_alias() the "if (nongit)" makes no sense any longer.
> If I have to revise the patch anyway, I will include the change, but if
> you decide to take it, please change that.
>
> Ciao,
> Dscho
>
> P.S.: There might be other users (such as git-peek-remote) who want that
> change, too.
Well, this is pretty late in the 1.4.0 game and honestly I am
pretty reluctant to merge this in, push 1.4.0 out in 48 hours
and leave for nearly a week.
So either we would reschedule 1.4.0 and shoot for June 24th, or
do 1.4.0 this weekend as planned, and leave this as the first
item (perhaps the second, after applying many small clean-ups
I've privately received, which I haven't acted on other than
quickly reviewing and asking the submitter to rebase and resend
cc'ing the list) in the post-1.4.0 development cycle. This
potentially is a candidate to backport to 1.4.X series.
My preference is to cook this in "next" for a while and merge it
post 1.4.0.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 1/2]: amendment
2006-06-08 15:22 [PATCH 1/2]: amendment Johannes Schindelin
2006-06-08 16:51 ` Junio C Hamano
@ 2006-06-08 16:52 ` Junio C Hamano
1 sibling, 0 replies; 4+ messages in thread
From: Junio C Hamano @ 2006-06-08 16:52 UTC (permalink / raw)
To: Johannes Schindelin; +Cc: git
Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
> I completely forgot that with a global config, it makes sense to have
> aliases even if we are not in a git repository.
>
> So, in git.c, handle_alias() the "if (nongit)" makes no sense any longer.
> If I have to revise the patch anyway, I will include the change, but if
> you decide to take it, please change that.
>
> Ciao,
> Dscho
>
> P.S.: There might be other users (such as git-peek-remote) who want that
> change, too.
Well, this is pretty late in the 1.4.0 game and honestly I am
pretty reluctant to merge this in, push 1.4.0 out in 48 hours
and leave for nearly a week.
So either we would reschedule 1.4.0 and shoot for June 24th, or
do 1.4.0 this weekend as planned, and leave this as the first
item (perhaps the second, after applying many small clean-ups
I've privately received, which I haven't acted on other than
quickly reviewing and asking the submitter to rebase and resend
cc'ing the list) in the post-1.4.0 development cycle. This
potentially is a candidate to backport to 1.4.X series.
My preference is to cook this in "next" for a while and merge it
post 1.4.0.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 1/2]: amendment
2006-06-08 16:51 ` Junio C Hamano
@ 2006-06-08 20:11 ` Johannes Schindelin
0 siblings, 0 replies; 4+ messages in thread
From: Johannes Schindelin @ 2006-06-08 20:11 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
Hi,
On Thu, 8 Jun 2006, Junio C Hamano wrote:
> Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
>
> > I completely forgot that with a global config, it makes sense to have
> > aliases even if we are not in a git repository.
> >
> > So, in git.c, handle_alias() the "if (nongit)" makes no sense any longer.
> > If I have to revise the patch anyway, I will include the change, but if
> > you decide to take it, please change that.
> >
> > Ciao,
> > Dscho
> >
> > P.S.: There might be other users (such as git-peek-remote) who want that
> > change, too.
>
> Well, this is pretty late in the 1.4.0 game and honestly I am
> pretty reluctant to merge this in, push 1.4.0 out in 48 hours
> and leave for nearly a week.
Sorry, I timed that rather badly.
> My preference is to cook this in "next" for a while and merge it
> post 1.4.0.
Judging from the flurry of creative flag naming wishes, I think that will
do just fine.
Ciao,
Dscho
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2006-06-08 20:11 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-06-08 15:22 [PATCH 1/2]: amendment Johannes Schindelin
2006-06-08 16:51 ` Junio C Hamano
2006-06-08 20:11 ` Johannes Schindelin
2006-06-08 16:52 ` Junio C Hamano
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox