public inbox for git@vger.kernel.org 
 help / color / mirror / Atom feed

From: Junio C Hamano <gitster@pobox•com>
To: "Nguyễn Thái Ngọc Duy" <pclouds@gmail•com>
Cc: git@vger•kernel.org, Antoine Pelisse <apelisse@gmail•com>
Subject: Re: [PATCH] Fix calling parse_pathspec with no paths nor PATHSPEC_PREFER_* flags
Date: Tue, 22 Oct 2013 11:16:15 -0700	[thread overview]
Message-ID: <xmqqd2mxtbm8.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <xmqq38ntusq6.fsf@gitster.dls.corp.google.com> (Junio C. Hamano's message of "Tue, 22 Oct 2013 10:21:21 -0700")

Junio C Hamano <gitster@pobox•com> writes:

> Nguyễn Thái Ngọc Duy  <pclouds@gmail•com> writes:
>
>> When parse_pathspec() is called with no paths, the behavior could be
>> either return no paths, or return one path that is cwd. Some commands
>> do the former, some the latter. parse_pathspec() itself does not make
>> either the default and requires the caller to specify either flag if
>> it may run into this situation.
>>
>> I've grep'd through all parse_pathspec() call sites. Some pass
>> neither, but those are guaranteed never pass empty path to
>> parse_pathspec(). There are two call sites that may pass empty path
>> and are fixed with this patch.
>>
>> Reported-by: Antoine Pelisse <apelisse@gmail•com>
>> Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail•com>
>> ---
>
> Thanks.

I've amended it with the following taken from Antoine's initial
report.

diff --git a/t/t4208-log-magic-pathspec.sh b/t/t4208-log-magic-pathspec.sh
index 72300b5..d8f23f4 100755
--- a/t/t4208-log-magic-pathspec.sh
+++ b/t/t4208-log-magic-pathspec.sh
@@ -46,4 +46,19 @@ test_expect_success 'git log HEAD -- :/' '
 	test_cmp expected actual
 '
 
+test_expect_success 'command line pathspec parsing for "git log"' '
+	git reset --hard &&
+	>a &&
+	git add a &&
+	git commit -m "add an empty a" --allow-empty &&
+	echo 1 >a &&
+	git commit -a -m "update a to 1" &&
+	git checkout HEAD^ &&
+	echo 2 >a &&
+	git commit -a -m "update a to 2" &&
+	test_must_fail git merge master &&
+	git add a &&
+	git log --merge -- a
+'
+
 test_done

     prev parent reply	other threads:[~2013-10-22 18:16 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-10-18  9:21 BUG: PATHSPEC_PREFER_CWD requires arguments Antoine Pelisse
2013-10-19  2:41 ` [PATCH] Fix calling parse_pathspec with no paths nor PATHSPEC_PREFER_* flags Nguyễn Thái Ngọc Duy
2013-10-22 17:21   ` Junio C Hamano
2013-10-22 18:16     ` Junio C Hamano [this message]

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:72300b5 dfblob:d8f23f4 )
 OR (
bs:"Re: [PATCH] Fix calling parse_pathspec with no paths nor PATHSPEC_PREFER_* flags" )
	(help)

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=xmqqd2mxtbm8.fsf@gitster.dls.corp.google.com \
    --to=gitster@pobox$(echo .)com \
    --cc=apelisse@gmail$(echo .)com \
    --cc=git@vger$(echo .)kernel.org \
    --cc=pclouds@gmail$(echo .)com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox