From: Johannes Schindelin <Johannes.Schindelin@gmx.de> To: Junio C Hamano <gitster@pobox.com> Cc: Johannes Schindelin via GitGitGadget <gitgitgadget@gmail.com>, git@vger.kernel.org Subject: Re: [PATCH] t4015: let the test pass with any default branch name Date: Thu, 19 Nov 2020 00:13:13 +0100 (CET) Message-ID: <nycvar.QRO.7.76.6.2011190011340.56@tvgsbejvaqbjf.bet> (raw) In-Reply-To: <xmqqd00a1knr.fsf@gitster.c.googlers.com> Hi Junio, On Wed, 18 Nov 2020, Junio C Hamano wrote: > "Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com> > writes: > > > From: Johannes Schindelin <johannes.schindelin@gmx.de> > > > > We do not need to hard-code the actual branch name, as we have access to > > the reflog and can be a lot more precise at what we want. > > I am not enthused to see us going beyond "@{1}" or "@{-1}". Right. It also makes it a bit harder to understand the test case for the occasional reader. > It would make the test a bit too brittle as a future changes need to > refrain from creating another commit and/or switching to a third branch > to do some more set-up before coming here to attempt an merge. > > In this particular case, "git merge @{-1}" may be more robust from > that point of view It might be _slightly_ more robust, but not by a lot. I opted to use `test_commit` instead and then refer to the revision via the tag that is created by that function. Ciao, Dscho > > diff --git a/t/t4015-diff-whitespace.sh b/t/t4015-diff-whitespace.sh > > index 8bdaa0a693..c9dd62b70e 100755 > > --- a/t/t4015-diff-whitespace.sh > > +++ b/t/t4015-diff-whitespace.sh > > @@ -883,7 +883,8 @@ test_expect_success 'combined diff with autocrlf conversion' ' > > echo >x goodbye && > > git commit -m "the other side" x && > > git config core.autocrlf true && > > - test_must_fail git merge master && > > + test_must_fail git merge @{2} >actual && > > + test_i18ngrep "Automatic merge failed" actual && > > > > git diff >actual.raw && > > sed -e "1,/^@@@/d" actual.raw >actual && > > > > base-commit: e31aba42fb12bdeb0f850829e008e1e3f43af500 > >
next prev parent reply other threads:[~2020-11-18 23:15 UTC|newest] Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-11-18 19:26 Johannes Schindelin via GitGitGadget 2020-11-18 20:20 ` Junio C Hamano 2020-11-18 23:13 ` Johannes Schindelin [this message] 2020-11-18 23:35 ` [PATCH v2] " Johannes Schindelin via GitGitGadget
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 List information: http://vger.kernel.org/majordomo-info.html * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=nycvar.QRO.7.76.6.2011190011340.56@tvgsbejvaqbjf.bet \ --to=johannes.schindelin@gmx.de \ --cc=git@vger.kernel.org \ --cc=gitgitgadget@gmail.com \ --cc=gitster@pobox.com \ --subject='Re: [PATCH] t4015: let the test pass with any default branch name' \ /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
git@vger.kernel.org list mirror (unofficial, one of many) This inbox may be cloned and mirrored by anyone: git clone --mirror https://public-inbox.org/git git clone --mirror http://ou63pmih66umazou.onion/git git clone --mirror http://czquwvybam4bgbro.onion/git git clone --mirror http://hjrcffqmbrq6wope.onion/git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V1 git git/ https://public-inbox.org/git \ git@vger.kernel.org public-inbox-index git Example config snippet for mirrors. Newsgroups are available over NNTP: nntp://news.public-inbox.org/inbox.comp.version-control.git nntp://ou63pmih66umazou.onion/inbox.comp.version-control.git nntp://czquwvybam4bgbro.onion/inbox.comp.version-control.git nntp://hjrcffqmbrq6wope.onion/inbox.comp.version-control.git nntp://news.gmane.io/gmane.comp.version-control.git note: .onion URLs require Tor: https://www.torproject.org/ code repositories for project(s) associated with this inbox: https://80x24.org/mirrors/git.git AGPL code for this site: git clone https://public-inbox.org/public-inbox.git