Skip to content

Commit d4a9463

Browse files
author
Albin Vass
committed
Apply hotfix to git toprepo
1 parent 12ab8c9 commit d4a9463

File tree

2 files changed

+28
-1
lines changed

2 files changed

+28
-1
lines changed

homes/vcc/home.nix

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@
3232
#!${pkgs.bash}/bin/bash
3333
${pkgs.bazelisk}/bin/bazelisk "$@"
3434
'';
35+
git-toprepo-patched = inputs.git-toprepo.packages.${pkgs.system}.git-toprepo.overrideAttrs (oldAttrs: {
36+
patches = ../../patches/toprepo-fetch-hotfix.patch;
37+
});
3538
in
3639
[
3740
bitwarden
@@ -48,9 +51,9 @@
4851
arandr
4952
flameshot
5053
xclip
51-
inputs.git-toprepo.packages.${pkgs.system}.git-toprepo
5254
vivaldi
5355
feishin
56+
git-toprepo-patched
5457
]
5558
++ [
5659
s

patches/toprepo-fetch-hotfix.patch

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
From d8ddac9c239d2f2ed8c2a7010ad27dd834e29531 Mon Sep 17 00:00:00 2001
2+
From: Albin Vass <albinvass@gmail.com>
3+
Date: Tue, 22 Apr 2025 15:02:52 +0200
4+
Subject: [PATCH] fetch hotfix
5+
6+
---
7+
git_toprepo.py | 1 +
8+
1 file changed, 1 insertion(+)
9+
10+
diff --git a/git_toprepo.py b/git_toprepo.py
11+
index 56f88c8..8cd8f2e 100755
12+
--- a/git_toprepo.py
13+
+++ b/git_toprepo.py
14+
@@ -1820,6 +1820,7 @@ class TopRepoExpander(RepoExpanderBase):
15+
ret = [
16+
self.subrepo_id_to_converted_id[parent_id]
17+
for parent_id in subrepo_commit_to_insert.parents
18+
+ if parent_id in self.subrepo_id_to_converted_id
19+
]
20+
ints = [-1] * len(ret)
21+
for i, val in enumerate(ret):
22+
--
23+
2.48.1
24+

0 commit comments

Comments
 (0)