summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean Whitton <spwhitton@spwhitton.name>2022-10-16 15:17:50 -0700
committerSean Whitton <spwhitton@spwhitton.name>2022-10-18 12:40:47 -0700
commitfb078c0fb7f275f802eb78531344ef848798646b (patch)
treef0d865572ab0be9626bdb5d1adbf83f95363d3e5
parentde5e6bed742ac7167eaf93c685e95470d26f9ed7 (diff)
downloaddotfiles-fb078c0fb7f275f802eb78531344ef848798646b.tar.gz
register all git worktrees with myrepos
-rwxr-xr-xbin/locmaint4
-rw-r--r--perl5/Local/Homedir.pm6
2 files changed, 3 insertions, 7 deletions
diff --git a/bin/locmaint b/bin/locmaint
index 94c2e2de..919d8c3a 100755
--- a/bin/locmaint
+++ b/bin/locmaint
@@ -705,8 +705,8 @@ sub loose_src_files {
&& /([^_]+)_([^_]+)\.orig(?:\.gbp)?\.tar/
&& exists $Local::Homedir::debian_source_repos{$1})
}, preprocess => sub {
- # don't look inside any repos or git worktrees
- return grep !Local::Homedir::is_repo($_, 1), @_
+ # don't look inside any worktrees
+ return grep !Local::Homedir::is_repo($_), @_
}}, "$ENV{HOME}/src");
if (@loose_src_files == 0) {
return 0;
diff --git a/perl5/Local/Homedir.pm b/perl5/Local/Homedir.pm
index 3030f4b0..b20259b6 100644
--- a/perl5/Local/Homedir.pm
+++ b/perl5/Local/Homedir.pm
@@ -208,10 +208,6 @@ sub say_block (*$$) {
print $fh "\n";
}
-sub is_repo {
- my ($repo, $include_worktrees) = @_;
- return -d "$repo/.git" || -d "$repo/.hg"
- || $include_worktrees && -f "$repo/.git";
-}
+sub is_repo { -e "$_[0]/.git" or -d "$_[0]/.hg" }
1;