diff mbox series

[v2,3/3] Add test for describe with a bare repository

Message ID 20190126204951.42455-3-koraktor@gmail.com (mailing list archive)
State New, archived
Headers show
Series [v2,1/3] Add tests for describe with --work-tree | expand

Commit Message

Sebastian Staudt Jan. 26, 2019, 8:49 p.m. UTC
This ensures that nothing breaks the basic functionality of describe for
bare repositories. Please note that --broken and --dirty need a working
tree.

Signed-off-by: Sebastian Staudt <koraktor@gmail.com>
---
 t/t6120-describe.sh | 7 +++++++
 1 file changed, 7 insertions(+)

Comments

Duy Nguyen Jan. 27, 2019, 12:25 a.m. UTC | #1
On Sun, Jan 27, 2019 at 3:51 AM Sebastian Staudt <koraktor@gmail.com> wrote:
>
> This ensures that nothing breaks the basic functionality of describe for
> bare repositories. Please note that --broken and --dirty need a working
> tree.
>
> Signed-off-by: Sebastian Staudt <koraktor@gmail.com>
> ---
>  t/t6120-describe.sh | 7 +++++++
>  1 file changed, 7 insertions(+)
>
> diff --git a/t/t6120-describe.sh b/t/t6120-describe.sh
> index 9a6bd1541f..ddd8cc307d 100755
> --- a/t/t6120-describe.sh
> +++ b/t/t6120-describe.sh
> @@ -409,4 +409,11 @@ test_expect_success 'describe complains about missing object' '
>         test_must_fail git describe $ZERO_OID
>  '
>
> +test_expect_success 'describe works from outside repo using --git-dir' "
> +  BARE_CLONE=$(mktemp -d) &&

No, keep everything in $TRASH_DIRECTORY so it will be automatically cleaned.

> +  git clone --bare '$TRASH_DIRECTORY' \$BARE_CLONE >/Users/koraktor/open-source/others/git/t/out &&

Ehh.. I'm pretty sure I don't have /Users/koraktor on my system :)
This looks like just debug code, I think you can drop ">.." part for
all commands.

> +  echo $PWD >/Users/koraktor/open-source/others/git/t/out &&
> +  git --git-dir \$BARE_CLONE describe 2>&1 >/Users/koraktor/open-source/others/git/t/out
> +"
> +
>  test_done
> --
> 2.20.1
>
Sebastian Staudt Jan. 27, 2019, 6:54 a.m. UTC | #2
Am So., 27. Jan. 2019 um 01:25 Uhr schrieb Duy Nguyen <pclouds@gmail.com>:
>
> On Sun, Jan 27, 2019 at 3:51 AM Sebastian Staudt <koraktor@gmail.com> wrote:
> >
> > This ensures that nothing breaks the basic functionality of describe for
> > bare repositories. Please note that --broken and --dirty need a working
> > tree.
> >
> > Signed-off-by: Sebastian Staudt <koraktor@gmail.com>
> > ---
> >  t/t6120-describe.sh | 7 +++++++
> >  1 file changed, 7 insertions(+)
> >
> > diff --git a/t/t6120-describe.sh b/t/t6120-describe.sh
> > index 9a6bd1541f..ddd8cc307d 100755
> > --- a/t/t6120-describe.sh
> > +++ b/t/t6120-describe.sh
> > @@ -409,4 +409,11 @@ test_expect_success 'describe complains about missing object' '
> >         test_must_fail git describe $ZERO_OID
> >  '
> >
> > +test_expect_success 'describe works from outside repo using --git-dir' "
> > +  BARE_CLONE=$(mktemp -d) &&
>
> No, keep everything in $TRASH_DIRECTORY so it will be automatically cleaned.

Looks like a relic from trying to get Git to not find an appropriate
working tree.
$TRASH_DIRECTORY/bare works here, too.

>
> > +  git clone --bare '$TRASH_DIRECTORY' \$BARE_CLONE >/Users/koraktor/open-source/others/git/t/out &&
>
> Ehh.. I'm pretty sure I don't have /Users/koraktor on my system :)
> This looks like just debug code, I think you can drop ">.." part for
> all commands.
>

Sorry. A bit embarrassing to leave debugging code in place.
I will remove the output redirection and echo.


> > +  echo $PWD >/Users/koraktor/open-source/others/git/t/out &&
> > +  git --git-dir \$BARE_CLONE describe 2>&1 >/Users/koraktor/open-source/others/git/t/out
> > +"
> > +
> >  test_done
> > --
> > 2.20.1
> >
>
>
> --
> Duy
diff mbox series

Patch

diff --git a/t/t6120-describe.sh b/t/t6120-describe.sh
index 9a6bd1541f..ddd8cc307d 100755
--- a/t/t6120-describe.sh
+++ b/t/t6120-describe.sh
@@ -409,4 +409,11 @@  test_expect_success 'describe complains about missing object' '
 	test_must_fail git describe $ZERO_OID
 '
 
+test_expect_success 'describe works from outside repo using --git-dir' "
+  BARE_CLONE=$(mktemp -d) &&
+  git clone --bare '$TRASH_DIRECTORY' \$BARE_CLONE >/Users/koraktor/open-source/others/git/t/out &&
+  echo $PWD >/Users/koraktor/open-source/others/git/t/out &&
+  git --git-dir \$BARE_CLONE describe 2>&1 >/Users/koraktor/open-source/others/git/t/out
+"
+
 test_done