From: Junio C Hamano <gitster@pobox.com>
To: Johan Herland <johan@herland.net>
Cc: git@vger.kernel.org, Ramkumar Ramachandra <artagnon@gmail.com>
Subject: Re: [PATCH 3/6] push: change `simple` to accommodate triangular workflows
Date: Mon, 24 Jun 2013 00:59:52 -0700 [thread overview]
Message-ID: <7vppvcc51j.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <CALKQrgfAT9GhD-_tZHr9wRA6R6g7ttDWTsmUQXdWUhG-gwNBqQ@mail.gmail.com> (Johan Herland's message of "Mon, 24 Jun 2013 08:58:23 +0200")
Johan Herland <johan@herland.net> writes:
>> An earlier round of this change by mistake broke the safety for
>> "simple" mode we have had since day 1 of that mode to make sure that
>> the branch in the repository we update is set to be the one we fetch
>> and integrate with, but it has been fixed.
>
> Shouldn't there be an acompanying test to demonstrate this mistake being fixed?
An operation that has to expect failure due to safety was disabled
by the broken version. The squashed end result reverts that change
to the test, to make sure we did not break the safety.
next prev parent reply other threads:[~2013-06-24 7:59 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-24 4:33 [PATCH 0/6] Reroll of rr/triangular-push-fix Junio C Hamano
2013-06-24 4:33 ` [PATCH 1/6] t/t5528-push-default: remove redundant test_config lines Junio C Hamano
2013-06-24 4:33 ` [PATCH 2/6] config doc: rewrite push.default section Junio C Hamano
2013-06-24 4:33 ` [PATCH 3/6] push: change `simple` to accommodate triangular workflows Junio C Hamano
2013-06-24 6:58 ` Johan Herland
2013-06-24 7:43 ` Junio C Hamano
2013-06-24 7:46 ` Ramkumar Ramachandra
2013-06-24 8:48 ` Johan Herland
2013-06-24 14:13 ` Ramkumar Ramachandra
2013-06-24 7:59 ` Junio C Hamano [this message]
2013-06-24 8:48 ` Johan Herland
2013-06-24 4:33 ` [PATCH 4/6] t/t5528-push-default: generalize test_push_* Junio C Hamano
2013-06-24 6:58 ` Johan Herland
2013-06-24 7:28 ` Junio C Hamano
2013-06-24 8:33 ` Johan Herland
2013-06-24 8:44 ` Eric Sunshine
2013-06-24 9:45 ` Johan Herland
2013-06-24 17:21 ` Junio C Hamano
2013-06-24 4:33 ` [PATCH 5/6] t/t5528-push-default: test pushdefault workflows Junio C Hamano
2013-06-24 4:33 ` [PATCH 6/6] push: honor branch.*.push Junio C Hamano
2013-06-24 6:58 ` Johan Herland
2013-06-24 7:47 ` Junio C Hamano
2013-06-24 7:58 ` Ramkumar Ramachandra
2013-06-24 8:17 ` Junio C Hamano
2013-06-24 14:19 ` Ramkumar Ramachandra
2013-06-24 15:23 ` Johan Herland
2013-06-24 16:08 ` Junio C Hamano
2013-06-24 15:41 ` Junio C Hamano
2013-06-24 16:09 ` Ramkumar Ramachandra
2013-06-24 16:53 ` Junio C Hamano
2013-06-24 17:13 ` Ramkumar Ramachandra
2013-06-24 18:19 ` Junio C Hamano
2013-06-24 18:23 ` Ramkumar Ramachandra
2013-06-24 7:21 ` [PATCH 0/6] Reroll of rr/triangular-push-fix Ramkumar Ramachandra
2013-06-24 8:12 ` Junio C Hamano
2013-06-24 13:51 ` Ramkumar Ramachandra
-- strict thread matches above, loose matches on Subject: below --
2013-06-19 11:11 [PATCH 0/6] push.default in the triangular world Ramkumar Ramachandra
2013-06-19 11:11 ` [PATCH 3/6] push: change `simple` to accommodate triangular workflows Ramkumar Ramachandra
2013-06-19 20:00 ` Junio C Hamano
2013-06-20 2:57 ` Junio C Hamano
2013-06-20 10:09 ` Ramkumar Ramachandra
2013-06-20 19:23 ` Junio C Hamano
2013-06-20 20:49 ` Philip Oakley
2013-06-20 21:03 ` Junio C Hamano
2013-06-20 21:22 ` Ramkumar Ramachandra
2013-06-20 21:56 ` Junio C Hamano
2013-06-20 22:05 ` Junio C Hamano
2013-06-20 21:41 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7vppvcc51j.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=artagnon@gmail.com \
--cc=git@vger.kernel.org \
--cc=johan@herland.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).