Re: [PATCH 0/6] Reroll of rr/triangular-push-fix

2013-06-24 Thread Ramkumar Ramachandra
Junio C Hamano wrote:
   [PATCH 3/6] push: change `simple` to accommodate triangular workflows

   Sqaushed in the fix to keep the semantics of simple when used in
   the centralized workflow the same as before.

Yeah, I'm worried about this as I pointed out earlier.  I don't like
erroring out when no branch.$branch.merge is not explicitly set, when
the 95% usecase is not naming local branches differently from remote
branches (oh, and I already pointed out how difficult it is to set the
damn thing).  So, I'm working on a series to  make
branch.$branch.merge default to refs/heads/$branch.  Yes, I'm aware of
your argument:

 We already have a sane default, which is to error out.  We do not
 need your broken default.

I hope (perhaps foolishly) to persuade you nevertheless. I fear that
if this series solidifies before I get there, we'll be stuck with this
stupid erroring-out behavior forever.
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


Re: [PATCH 0/6] Reroll of rr/triangular-push-fix

2013-06-24 Thread Junio C Hamano
Ramkumar Ramachandra artag...@gmail.com writes:

 I hope (perhaps foolishly) to persuade you nevertheless. I fear that
 if this series solidifies before I get there, we'll be stuck with this
 stupid erroring-out behavior forever.

I do not think it is stupid at all.

'simple' is supposed to be an easy and safe default to help new
people.  Your original patch to change its semantics for the central
workflow from the current 'make sure upstream is set and set to the
same name' to 'anything goes' is making the mode more dangerous than
the corresponding 'upstream'.  Such a mode may have its place, but
labelling such a mode with rough edges as 'simple' and forcing it on
new people _is_ stupid, IMHO.

In any case, the good news is, if you start strict, and if it turns
out to be stricter than necessary, it is easier to loosen it later,
because nobody would be relying on an operation to _fail_.

If you start too loose without safety, however, it is a lot harder
to tighten it later when it turns out that safety helps new people.

Since the beginning of this series, our working assumption for
triangular-simple' has been that it can just turn into a straight
'current'.  But given that 'simple' is supposed to be an easy and
safe default for new people, I suspect that it should be a bit more
strict.

For example, if you are on a random topic branch and say git push,
always pushing it out may not be a very sensible thing to do, and it
might be safer if we restrict 'triangular-simple' to push out the
current branch to the branch of the same name, but only when such a
branch already exists at the remote end, or something.
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


Re: [PATCH 0/6] Reroll of rr/triangular-push-fix

2013-06-24 Thread Ramkumar Ramachandra
Junio C Hamano wrote:
 'simple' is supposed to be an easy and safe default to help new
 people.  Your original patch to change its semantics for the central
 workflow from the current 'make sure upstream is set and set to the
 same name' to 'anything goes' is making the mode more dangerous than
 the corresponding 'upstream'.  Such a mode may have its place, but
 labelling such a mode with rough edges as 'simple' and forcing it on
 new people _is_ stupid, IMHO.

Oh, I agree that anything goes was the wrong approach.  However, I
think a sane default for branch.$branch.merge is a good way forward.

 In any case, the good news is, if you start strict, and if it turns
 out to be stricter than necessary, it is easier to loosen it later,
 because nobody would be relying on an operation to _fail_.

Okay,  I will quote you if you raise issues about preserving how it
has historically been functioning when I complete the upstream-fix
topic.

There's no need to stall this series then: [1/6] to [5/6] largely look
good-to-merge; drop [6/6], as it needs more thought.
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html