* [PATCH] t/t1517: indicate that `gui--askyesno` fails with GIT_TEST_INSTALLED
@ 2025-12-01 3:10 Brian Lyles
2025-12-31 19:09 ` Adam Dinwoodie
0 siblings, 1 reply; 2+ messages in thread
From: Brian Lyles @ 2025-12-01 3:10 UTC (permalink / raw)
To: git; +Cc: Brian Lyles, adam, hvoigt
Commit e749c87e75 (git-gui: provide question helper for retry fallback
on Windows, 2025-08-28) causes `git-gui--askyesno` to be installed when
running `make install`. This triggers a new occurrence of the issue
noted in commit c4cf8caadd (t/t1517: mark tests that fail with
GIT_TEST_INSTALLED, 2025-08-19), which prevents Git v2.52.0 from
building in nixpkgs [1]. Indicate that this is an expected failure.
[1]: https://github.com/NixOS/nixpkgs/issues/465178#issuecomment-3580790826
Signed-off-by: Brian Lyles <brianmlyles@gmail•com>
---
Note that while this does allow nixpkgs to build v2.52.0, I suspect that
this sort of issue is likely to crop up again in the future. I wonder if
it may be beneficial to make some more fundamental change to this test
to avoid future occurrences. If that is preferred (and something that
someone has time to tackle in the near future), I am happy to allow this
patch to be obviated by such a change.
t/t1517-outside-repo.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/t/t1517-outside-repo.sh b/t/t1517-outside-repo.sh
index c824c1a25c..13540388f9 100755
--- a/t/t1517-outside-repo.sh
+++ b/t/t1517-outside-repo.sh
@@ -115,7 +115,7 @@ do
credential-osxkeychain | cvsexportcommit | cvsimport | cvsserver | \
daemon | \
difftool--helper | filter-branch | fsck-objects | get-tar-commit-id | \
- gui | gui--askpass | \
+ gui | gui--askpass | gui--askyesno | \
http-backend | http-fetch | http-push | init-db | \
merge-octopus | merge-one-file | merge-resolve | mergetool | \
mktag | p4 | p4.py | pickaxe | remote-ftp | remote-ftps | \
--
2.51.2
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] t/t1517: indicate that `gui--askyesno` fails with GIT_TEST_INSTALLED
2025-12-01 3:10 [PATCH] t/t1517: indicate that `gui--askyesno` fails with GIT_TEST_INSTALLED Brian Lyles
@ 2025-12-31 19:09 ` Adam Dinwoodie
0 siblings, 0 replies; 2+ messages in thread
From: Adam Dinwoodie @ 2025-12-31 19:09 UTC (permalink / raw)
To: git; +Cc: Brian Lyles, hvoigt
On Mon, 1 Dec 2025 at 03:10, Brian Lyles <brianmlyles@gmail•com> wrote:
>
> Commit e749c87e75 (git-gui: provide question helper for retry fallback
> on Windows, 2025-08-28) causes `git-gui--askyesno` to be installed when
> running `make install`. This triggers a new occurrence of the issue
> noted in commit c4cf8caadd (t/t1517: mark tests that fail with
> GIT_TEST_INSTALLED, 2025-08-19), which prevents Git v2.52.0 from
> building in nixpkgs [1]. Indicate that this is an expected failure.
>
> [1]: https://github.com/NixOS/nixpkgs/issues/465178#issuecomment-3580790826
>
> Signed-off-by: Brian Lyles <brianmlyles@gmail•com>
> ---
>
> Note that while this does allow nixpkgs to build v2.52.0, I suspect that
> this sort of issue is likely to crop up again in the future. I wonder if
> it may be beneficial to make some more fundamental change to this test
> to avoid future occurrences. If that is preferred (and something that
> someone has time to tackle in the near future), I am happy to allow this
> patch to be obviated by such a change.
>
> t/t1517-outside-repo.sh | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
Notwithstanding the discussion at
https://lore.kernel.org/git/xmqqect7fhnp.fsf@gitster.g/ et seq, it'd
be good to get this fix in a release. Ideally we'd have a better
long-term fix, but I don't think that should prevent fixing the
problems we have right now.
Signed-off-by: Adam Dinwoodie <adam@dinwoodie•org>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2025-12-31 19:10 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-12-01 3:10 [PATCH] t/t1517: indicate that `gui--askyesno` fails with GIT_TEST_INSTALLED Brian Lyles
2025-12-31 19:09 ` Adam Dinwoodie
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox