* [PATCH 4/4] git-prompt.sh: add tests for submodule indicator
@ 2017-01-22 23:11 Benjamin Fuchs
0 siblings, 0 replies; 5+ messages in thread
From: Benjamin Fuchs @ 2017-01-22 23:11 UTC (permalink / raw)
To: git; +Cc: szeder.dev, sbeller, email
---
t/t9903-bash-prompt.sh | 43 +++++++++++++++++++++++++++++++++++++++++++
1 file changed, 43 insertions(+)
diff --git a/t/t9903-bash-prompt.sh b/t/t9903-bash-prompt.sh
index 97c9b32..4dce366 100755
--- a/t/t9903-bash-prompt.sh
+++ b/t/t9903-bash-prompt.sh
@@ -37,6 +37,11 @@ test_expect_success 'setup for prompt tests' '
git commit -m "yet another b2" file &&
mkdir ignored_dir &&
echo "ignored_dir/" >>.gitignore &&
+ git checkout -b submodule &&
+ git submodule add ./. sub &&
+ git -C sub checkout master &&
+ git add sub &&
+ git commit -m submodule &&
git checkout master
'
@@ -755,4 +760,42 @@ test_expect_success 'prompt - hide if pwd ignored - inside gitdir (stderr)' '
test_cmp expected "$actual"
'
+test_expect_success 'prompt - submodule indicator' '
+ printf " (sub:master)" >expected &&
+ git checkout submodule &&
+ test_when_finished "git checkout master" &&
+ (
+ cd sub &&
+ GIT_PS1_SHOWSUBMODULE=1 &&
+ __git_ps1 >"$actual"
+ ) &&
+ test_cmp expected "$actual"
+'
+
+test_expect_success 'prompt - submodule indicator - verify false' '
+ printf " (master)" >expected &&
+ git checkout submodule &&
+ test_when_finished "git checkout master" &&
+ (
+ cd sub &&
+ GIT_PS1_SHOWSUBMODULE= &&
+ __git_ps1 >"$actual"
+ ) &&
+ test_cmp expected "$actual"
+'
+
+test_expect_success 'prompt - submodule indicator - dirty status indicator' '
+ printf " (+sub:b1)" >expected &&
+ git checkout submodule &&
+ git -C sub checkout b1 &&
+ test_when_finished "git checkout master" &&
+ (
+ cd sub &&
+ GIT_PS1_SHOWSUBMODULE=1 &&
+ __git_ps1 >"$actual"
+ ) &&
+ test_cmp expected "$actual"
+'
+
+
test_done
--
2.7.4
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 0/4] git-prompt.sh: Full patch for submodule indicator
@ 2017-01-30 20:44 Benjamin Fuchs
2017-01-30 20:44 ` [PATCH 4/4] git-prompt.sh: add tests " Benjamin Fuchs
0 siblings, 1 reply; 5+ messages in thread
From: Benjamin Fuchs @ 2017-01-30 20:44 UTC (permalink / raw)
To: git; +Cc: szeder.dev, sbeller, sandals, ville.skytta, Benjamin Fuchs
Hi everyone,
since I didn't get a response I decided to sent my patch again. Maybe it was because
I to sent my consecutive commits the wrong way, so a new try.
First thanks again Steffen and Gábor for your feedback.
Based on the first feedback I rework the indicator and it is now way cheaper then the
first version and has a 'dirty' indicator now.
Tests exist also now.
Looking forward to more feedback!
Greetings,
Benjamin
Benjamin Fuchs (4):
git-prompt.sh: add submodule indicator
git-prompt.sh: rework of submodule indicator
git-prompt.sh: fix for submodule 'dirty' indicator
git-prompt.sh: add tests for submodule indicator
contrib/completion/git-prompt.sh | 36 ++++++++++++++++++++++++++++++++-
t/t9903-bash-prompt.sh | 43 ++++++++++++++++++++++++++++++++++++++++
2 files changed, 78 insertions(+), 1 deletion(-)
--
2.7.4
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 4/4] git-prompt.sh: add tests for submodule indicator
2017-01-30 20:44 [PATCH 0/4] git-prompt.sh: Full patch " Benjamin Fuchs
@ 2017-01-30 20:44 ` Benjamin Fuchs
2017-01-31 18:32 ` SZEDER Gábor
0 siblings, 1 reply; 5+ messages in thread
From: Benjamin Fuchs @ 2017-01-30 20:44 UTC (permalink / raw)
To: git; +Cc: szeder.dev, sbeller, sandals, ville.skytta, Benjamin Fuchs
Signed-off-by: Benjamin Fuchs <email@benjaminfuchs.de>
---
t/t9903-bash-prompt.sh | 43 +++++++++++++++++++++++++++++++++++++++++++
1 file changed, 43 insertions(+)
diff --git a/t/t9903-bash-prompt.sh b/t/t9903-bash-prompt.sh
index 97c9b32..4dce366 100755
--- a/t/t9903-bash-prompt.sh
+++ b/t/t9903-bash-prompt.sh
@@ -37,6 +37,11 @@ test_expect_success 'setup for prompt tests' '
git commit -m "yet another b2" file &&
mkdir ignored_dir &&
echo "ignored_dir/" >>.gitignore &&
+ git checkout -b submodule &&
+ git submodule add ./. sub &&
+ git -C sub checkout master &&
+ git add sub &&
+ git commit -m submodule &&
git checkout master
'
@@ -755,4 +760,42 @@ test_expect_success 'prompt - hide if pwd ignored - inside gitdir (stderr)' '
test_cmp expected "$actual"
'
+test_expect_success 'prompt - submodule indicator' '
+ printf " (sub:master)" >expected &&
+ git checkout submodule &&
+ test_when_finished "git checkout master" &&
+ (
+ cd sub &&
+ GIT_PS1_SHOWSUBMODULE=1 &&
+ __git_ps1 >"$actual"
+ ) &&
+ test_cmp expected "$actual"
+'
+
+test_expect_success 'prompt - submodule indicator - verify false' '
+ printf " (master)" >expected &&
+ git checkout submodule &&
+ test_when_finished "git checkout master" &&
+ (
+ cd sub &&
+ GIT_PS1_SHOWSUBMODULE= &&
+ __git_ps1 >"$actual"
+ ) &&
+ test_cmp expected "$actual"
+'
+
+test_expect_success 'prompt - submodule indicator - dirty status indicator' '
+ printf " (+sub:b1)" >expected &&
+ git checkout submodule &&
+ git -C sub checkout b1 &&
+ test_when_finished "git checkout master" &&
+ (
+ cd sub &&
+ GIT_PS1_SHOWSUBMODULE=1 &&
+ __git_ps1 >"$actual"
+ ) &&
+ test_cmp expected "$actual"
+'
+
+
test_done
--
2.7.4
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 4/4] git-prompt.sh: add tests for submodule indicator
2017-01-30 20:44 ` [PATCH 4/4] git-prompt.sh: add tests " Benjamin Fuchs
@ 2017-01-31 18:32 ` SZEDER Gábor
2017-01-31 22:06 ` Junio C Hamano
0 siblings, 1 reply; 5+ messages in thread
From: SZEDER Gábor @ 2017-01-31 18:32 UTC (permalink / raw)
To: Benjamin Fuchs; +Cc: git, Stefan Beller, brian m. carlson, ville.skytta
On Mon, Jan 30, 2017 at 9:44 PM, Benjamin Fuchs <email@benjaminfuchs.de> wrote:
> Signed-off-by: Benjamin Fuchs <email@benjaminfuchs.de>
> ---
> t/t9903-bash-prompt.sh | 43 +++++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 43 insertions(+)
>
> diff --git a/t/t9903-bash-prompt.sh b/t/t9903-bash-prompt.sh
> index 97c9b32..4dce366 100755
> --- a/t/t9903-bash-prompt.sh
> +++ b/t/t9903-bash-prompt.sh
> @@ -37,6 +37,11 @@ test_expect_success 'setup for prompt tests' '
> git commit -m "yet another b2" file &&
> mkdir ignored_dir &&
> echo "ignored_dir/" >>.gitignore &&
> + git checkout -b submodule &&
> + git submodule add ./. sub &&
./. ?
> + git -C sub checkout master &&
> + git add sub &&
> + git commit -m submodule &&
> git checkout master
> '
>
> @@ -755,4 +760,42 @@ test_expect_success 'prompt - hide if pwd ignored - inside gitdir (stderr)' '
> test_cmp expected "$actual"
> '
>
> +test_expect_success 'prompt - submodule indicator' '
> + printf " (sub:master)" >expected &&
> + git checkout submodule &&
> + test_when_finished "git checkout master" &&
> + (
> + cd sub &&
> + GIT_PS1_SHOWSUBMODULE=1 &&
> + __git_ps1 >"$actual"
> + ) &&
> + test_cmp expected "$actual"
> +'
> +
> +test_expect_success 'prompt - submodule indicator - verify false' '
I was puzzled by the "verify false" here. You mean "disabled", right?
> + printf " (master)" >expected &&
> + git checkout submodule &&
> + test_when_finished "git checkout master" &&
> + (
> + cd sub &&
> + GIT_PS1_SHOWSUBMODULE= &&
> + __git_ps1 >"$actual"
> + ) &&
> + test_cmp expected "$actual"
> +'
> +
> +test_expect_success 'prompt - submodule indicator - dirty status indicator' '
> + printf " (+sub:b1)" >expected &&
> + git checkout submodule &&
> + git -C sub checkout b1 &&
> + test_when_finished "git checkout master" &&
> + (
> + cd sub &&
> + GIT_PS1_SHOWSUBMODULE=1 &&
> + __git_ps1 >"$actual"
> + ) &&
> + test_cmp expected "$actual"
> +'
> +
> +
> test_done
> --
> 2.7.4
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 4/4] git-prompt.sh: add tests for submodule indicator
2017-01-31 18:32 ` SZEDER Gábor
@ 2017-01-31 22:06 ` Junio C Hamano
2017-01-31 22:12 ` Stefan Beller
0 siblings, 1 reply; 5+ messages in thread
From: Junio C Hamano @ 2017-01-31 22:06 UTC (permalink / raw)
To: SZEDER Gábor
Cc: Benjamin Fuchs, git, Stefan Beller, brian m. carlson,
ville.skytta
SZEDER Gábor <szeder.dev@gmail.com> writes:
> On Mon, Jan 30, 2017 at 9:44 PM, Benjamin Fuchs <email@benjaminfuchs.de> wrote:
>> Signed-off-by: Benjamin Fuchs <email@benjaminfuchs.de>
>> ---
>> t/t9903-bash-prompt.sh | 43 +++++++++++++++++++++++++++++++++++++++++++
>> 1 file changed, 43 insertions(+)
>>
>> diff --git a/t/t9903-bash-prompt.sh b/t/t9903-bash-prompt.sh
>> index 97c9b32..4dce366 100755
>> --- a/t/t9903-bash-prompt.sh
>> +++ b/t/t9903-bash-prompt.sh
>> @@ -37,6 +37,11 @@ test_expect_success 'setup for prompt tests' '
>> git commit -m "yet another b2" file &&
>> mkdir ignored_dir &&
>> echo "ignored_dir/" >>.gitignore &&
>> + git checkout -b submodule &&
>> + git submodule add ./. sub &&
>
> ./. ?
Good eyes. This is a pattern we are trying to wean ourselves off
of. E.g. cf.
https://public-inbox.org/git/20170105192904.1107-2-sbeller@google.com/#t
Hopefully this reminds us to resurrect and finish the test fixes in
that thread?
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH 4/4] git-prompt.sh: add tests for submodule indicator
2017-01-31 22:06 ` Junio C Hamano
@ 2017-01-31 22:12 ` Stefan Beller
0 siblings, 0 replies; 5+ messages in thread
From: Stefan Beller @ 2017-01-31 22:12 UTC (permalink / raw)
To: Junio C Hamano
Cc: SZEDER Gábor, Benjamin Fuchs, git@vger.kernel.org,
brian m. carlson, ville.skytta
On Tue, Jan 31, 2017 at 2:06 PM, Junio C Hamano <gitster@pobox.com> wrote:
> SZEDER Gábor <szeder.dev@gmail.com> writes:
>
>> On Mon, Jan 30, 2017 at 9:44 PM, Benjamin Fuchs <email@benjaminfuchs.de> wrote:
>>> Signed-off-by: Benjamin Fuchs <email@benjaminfuchs.de>
>>> ---
>>> t/t9903-bash-prompt.sh | 43 +++++++++++++++++++++++++++++++++++++++++++
>>> 1 file changed, 43 insertions(+)
>>>
>>> diff --git a/t/t9903-bash-prompt.sh b/t/t9903-bash-prompt.sh
>>> index 97c9b32..4dce366 100755
>>> --- a/t/t9903-bash-prompt.sh
>>> +++ b/t/t9903-bash-prompt.sh
>>> @@ -37,6 +37,11 @@ test_expect_success 'setup for prompt tests' '
>>> git commit -m "yet another b2" file &&
>>> mkdir ignored_dir &&
>>> echo "ignored_dir/" >>.gitignore &&
>>> + git checkout -b submodule &&
>>> + git submodule add ./. sub &&
>>
>> ./. ?
>
> Good eyes. This is a pattern we are trying to wean ourselves off
> of. E.g. cf.
>
> https://public-inbox.org/git/20170105192904.1107-2-sbeller@google.com/#t
>
> Hopefully this reminds us to resurrect and finish the test fixes in
> that thread?
I plan to eventually, yes. but that is a refactoring, that has lower prio
than getting checkout working recursing into submodules.
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2017-01-31 22:15 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-01-22 23:11 [PATCH 4/4] git-prompt.sh: add tests for submodule indicator Benjamin Fuchs
-- strict thread matches above, loose matches on Subject: below --
2017-01-30 20:44 [PATCH 0/4] git-prompt.sh: Full patch " Benjamin Fuchs
2017-01-30 20:44 ` [PATCH 4/4] git-prompt.sh: add tests " Benjamin Fuchs
2017-01-31 18:32 ` SZEDER Gábor
2017-01-31 22:06 ` Junio C Hamano
2017-01-31 22:12 ` Stefan Beller
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).