summaryrefslogtreecommitdiffstats
path: root/debian/patches/progress-linux/0001-default-branch.patch
blob: 4dcf39393cb1d009e85eecb559a71e6a87a61b36 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
Author: Daniel Baumann <daniel.baumann@progress-linux.org>
Description: Using main as default branch in gitolite-admin.git hooks.

diff -Naurp gitolite3.orig/src/lib/Gitolite/Hooks/PostUpdate.pm gitolite3/src/lib/Gitolite/Hooks/PostUpdate.pm
--- gitolite3.orig/src/lib/Gitolite/Hooks/PostUpdate.pm
+++ gitolite3/src/lib/Gitolite/Hooks/PostUpdate.pm
@@ -20,23 +20,23 @@ use warnings;
 
 sub post_update {
     trace( 3, 'post-up', @ARGV );
-    exit 0 unless grep( m(^refs/heads/master$), @ARGV );
+    exit 0 unless grep( m(^refs/heads/main$), @ARGV );
     # this is the *real* post_update hook for gitolite
 
-    tsh_try("git ls-tree --name-only master");
+    tsh_try("git ls-tree --name-only main");
     _die "no files/dirs called 'hooks' or 'logs' are allowed" if tsh_text() =~ /^(hooks|logs)$/m;
 
     my $hooks_changed = 0;
     {
         local $ENV{GIT_WORK_TREE} = $rc{GL_ADMIN_BASE};
 
-        tsh_try("git diff --name-only master");
+        tsh_try("git diff --name-only main");
         $hooks_changed++ if tsh_text() =~ m(/hooks/common/);
         # the leading slash ensure that this hooks/common directory is below
         # some top level directory, not *at* the top.  That's LOCAL_CODE, and
         # it's actual name could be anything but it doesn't matter to us.
 
-        tsh_try("git checkout -f --quiet master");
+        tsh_try("git checkout -f --quiet main");
     }
     _system("gitolite compile");
     _system("gitolite setup --hooks-only") if $hooks_changed;