patch, 3 partst2106 vs. the default branch name

Yet another thing I noticed while working on https://github.com/gitgitgadget/git/pull/762.

Johannes Schindelin (3):
  t2106: adjust style to the current conventions
  t2106: make test independent of the current main branch name
  t2106: ensure that the checkout fails for the expected reason

 t/t2106-update-index-assume-unchanged.sh | 31 +++++++++++++-----------
 1 file changed, 17 insertions(+), 14 deletions(-)

base-commit: e31aba42fb12bdeb0f850829e008e1e3f43af500
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-792%2Fdscho%2Ft2106-and-default-branch-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-792/dscho/t2106-and-default-branch-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/792

From: Johannes Schindelin <johannes.schindelin@gmx.de>

We do have this wonderful shortcut `git checkout -` to go back to the previous branch, thanks to the reflog.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 t/t2106-update-index-assume-unchanged.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

"Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com> writes:

;-)

From: Johannes Schindelin <johannes.schindelin@gmx.de>

During the transition of the test suite to a new default branch name, it was noticed that this test case succeeded for the wrong reason when the default branch name was overridden.

While we fixed that in the previous commit, let's make sure that we look for a tell-tale in the error message that the `git checkout` failed for the reason we wanted it to fail.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 t/t2106-update-index-assume-unchanged.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

From: Johannes Schindelin <johannes.schindelin@gmx.de>

We settled on the style where the test cases' code starts by the opening single quote being on the `test_expect_*` line, and the closing quote being in its own line after the code.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 t/t2106-update-index-assume-unchanged.sh | 30 +++++++++++++-----------
 1 file changed, 16 insertions(+), 14 deletions(-)

"Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com> writes:

This seems to partly replicate and partly deprecate what is in that final stretch 27-or-28 patch series does to the same test script. Are we taking this and then removing a patch or two from that larger series?

Hi Junio,

On Wed, 18 Nov 2020, Junio C Hamano wrote:

Sorry, I meant to explain my current thinking: for v3, I want to accommodate your wish (to mark every test script with the hard-coded default branch name individually, and only those test scripts that actually need to hard-code it). It is not only to fulfill your wish, I got genuinely curious what would actually be needed to make that happen.

The four test scripts for which I sent patch series in the past hours to remove the use of the name `master` won't be touched by v3 of this here patch series at all (because it won't be necessary anymore).

Ciao, Dscho

Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:

Ah, OK. I somehow had an impression that the big series was more or less done but rethinking the structure and ejecting these changes to tests that do not care what name the "init" uses by default from the series makes a lot of sense.

Thanks.

Hi Junio,

On Wed, 18 Nov 2020, Junio C Hamano wrote:

Me, too. And if I had listened to certain people who claim that lazy programmers are the best programmers, I would have stopped there, too.

Yep.

Ciao, Dscho