From: Junio C Hamano <gitster@pobox•com>
To: "Torsten Bögershausen" <tboegi@web•de>
Cc: git@vger•kernel.org
Subject: Re: [PATCH] t5541: Improve push test
Date: Mon, 09 Dec 2013 14:10:56 -0800 [thread overview]
Message-ID: <xmqq61qxwu8f.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <201312092103.29047.tboegi@web.de> ("Torsten Bögershausen"'s message of "Mon, 9 Dec 2013 21:03:28 +0100")
Torsten Bögershausen <tboegi@web•de> writes:
> The old log-line looked like this:
> + 9d498b0...8598732 master -> master (forced update)
> And the new one like this:
> 9d498b0..8598732 master -> master
>
> - Loosen the grep pattern by not demanding "(forced update)"
Hmm, what is the reason for the change the output? The output this
piece is testing is the result of this:
git push origin master:retsam
echo "change changed" > path2 &&
git commit -a -m path2 --amend &&
# push master too; this ensures there is at least one '"'push'"' command to
# the remote helper and triggers interaction with the helper.
test_must_fail git push -v origin +master master:retsam >output 2>&1'
This is run inside test_repo_clone, which has /smart/test_repo.git
as its origin, which in turn has 'master' branch (and nothing else).
It
- pushes master to another branch retsam;
- amends its 'master';
- attempts to push the updated master to force-update master, and
also retsam without forcing. The latter needs to be forced to
succeed, and that is why we expect it to fail.
If the output from the push process says
+ 9d498b0...8598732 master -> master (forced update)
! [rejected] master -> retsam (non-fast-forward)
error: failed to push some refs to '../test_repo_copy/'
I think that is a good thing to do, no? After all, that is what we
show with Git native transports.
Is this patch merely matching a test to a broken behaviour of some
sort? Puzzled...
next prev parent reply other threads:[~2013-12-09 22:11 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-09 20:03 [PATCH] t5541: Improve push test Torsten Bögershausen
2013-12-09 22:10 ` Junio C Hamano [this message]
2013-12-11 15:13 ` Torsten Bögershausen
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=xmqq61qxwu8f.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=tboegi@web$(echo .)de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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