All of lore.kernel.org
 help / color / mirror / Atom feed
From: Antonio Ospite <ao2@ao2.it>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: gitster@pobox.com, git@vger.kernel.org,
	"Jonathan Nieder" <jrnieder@gmail.com>,
	"Stefan Beller" <sbeller@google.com>, "Jeff King" <peff@peff.net>,
	"SZEDER Gábor" <szeder.dev@gmail.com>
Subject: Re: [PATCH v7 09/10] submodule: support reading .gitmodules when it's not in the working tree
Date: Tue, 30 Oct 2018 12:16:30 +0100	[thread overview]
Message-ID: <20181030121630.0aec137f670bd5d3486cccc5@ao2.it> (raw)
In-Reply-To: <nycvar.QRO.7.76.6.1810301053540.4546@tvgsbejvaqbjf.bet>

On Tue, 30 Oct 2018 10:57:09 +0100 (STD)
Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:

> Hi Antonio,
>

Hi Johannes,

> On Thu, 25 Oct 2018, Antonio Ospite wrote:
> 
> > diff --git a/t/t7418-submodule-sparse-gitmodules.sh b/t/t7418-submodule-sparse-gitmodules.sh
> > new file mode 100755
[...]
> > +	echo "$PWD/submodule" >expect &&
> 
> Would you mind squashing this fixup in?
> 
> -- snip --
> diff --git a/t/t7418-submodule-sparse-gitmodules.sh b/t/t7418-submodule-sparse-gitmodules.sh
> index 21a86b89c6cb..3f7f27188313 100755
> --- a/t/t7418-submodule-sparse-gitmodules.sh
> +++ b/t/t7418-submodule-sparse-gitmodules.sh
> @@ -55,7 +55,7 @@ test_expect_success 'initialising submodule when the gitmodules config is not ch
>  	test_must_fail git -C super config submodule.submodule.url &&
>  	git -C super submodule init &&
>  	git -C super config submodule.submodule.url >actual &&
> -	echo "$PWD/submodule" >expect &&
> +	echo "$(pwd)/submodule" >expect &&
>  	test_cmp expect actual
>  '
>  
> -- snap --
> 
> On Windows, `$PWD` and `$(pwd)` are *not* synonymous. The former
> reflects the "Unix path" which is understood by the Bash script (and
> only by the Bash script, *not* by `git.exe`!) while the latter refers to
> the actual Windows path.
>

I see, this is also mentioned in t/README, I had overlooked that part.
Thank you for reporting.

> Without this fix, your new test case will fail on Windows all the time,
> see e.g.
> https://git-for-windows.visualstudio.com/git/_build/results?buildId=22913&view=logs
> 

Junio, what is the plan for 'ao/submodule-wo-gitmodules-checked-out'?
I see it's not in next yet; do you want me to resend the whole series
with this fixup in or would it be less overhead for you to apply it
directly to patch 9/10 from v7 of the series?

Thank you,
   Antonio

P.S. I was wondering if it is worth having patchset versions mentioned
somewhere in pu/, maybe in merge commits if not in branch names?
Or at least in whats-cooking.txt next to the date.

-- 
Antonio Ospite
https://ao2.it
https://twitter.com/ao2it

A: Because it messes up the order in which people normally read text.
   See http://en.wikipedia.org/wiki/Posting_style
Q: Why is top-posting such a bad thing?

  reply	other threads:[~2018-10-30 11:17 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-10-25 16:18 [PATCH v7 00/10] Make submodules work if .gitmodules is not checked out Antonio Ospite
2018-10-25 16:18 ` [PATCH v7 01/10] submodule: add a print_config_from_gitmodules() helper Antonio Ospite
2018-10-25 16:18 ` [PATCH v7 02/10] submodule: factor out a config_set_in_gitmodules_file_gently function Antonio Ospite
2018-10-25 16:18 ` [PATCH v7 03/10] t7411: merge tests 5 and 6 Antonio Ospite
2018-10-25 16:18 ` [PATCH v7 04/10] t7411: be nicer to future tests and really clean things up Antonio Ospite
2018-10-25 16:18 ` [PATCH v7 05/10] submodule--helper: add a new 'config' subcommand Antonio Ospite
2018-10-25 16:18 ` [PATCH v7 06/10] submodule: use the 'submodule--helper config' command Antonio Ospite
2018-10-25 16:18 ` [PATCH v7 07/10] t7506: clean up .gitmodules properly before setting up new scenario Antonio Ospite
2018-10-25 16:18 ` [PATCH v7 08/10] submodule: add a helper to check if it is safe to write to .gitmodules Antonio Ospite
2018-10-25 16:18 ` [PATCH v7 09/10] submodule: support reading .gitmodules when it's not in the working tree Antonio Ospite
2018-10-30  9:57   ` Johannes Schindelin
2018-10-30 11:16     ` Antonio Ospite [this message]
2018-10-31  6:01       ` Junio C Hamano
2018-10-25 16:18 ` [PATCH v7 10/10] t/helper: add test-submodule-nested-repo-config Antonio Ospite
2018-10-25 18:49 ` [PATCH v7 00/10] Make submodules work if .gitmodules is not checked out Stefan Beller
2018-10-26  1:59   ` Junio C Hamano
2018-10-26 18:43     ` Stefan Beller

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=20181030121630.0aec137f670bd5d3486cccc5@ao2.it \
    --to=ao2@ao2.it \
    --cc=Johannes.Schindelin@gmx.de \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=jrnieder@gmail.com \
    --cc=peff@peff.net \
    --cc=sbeller@google.com \
    --cc=szeder.dev@gmail.com \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.