gerrit/hooks: Fix all the things

* Gerrit runs these hooks multiple times on a single commit
haiku · Aug 6, 2019 · 4ba8714 · 4ba8714
1 parent bdc623b
commit 4ba8714
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 27 deletions.
diff --git a/data/gerrit/hooks/receive-notify.pl b/data/gerrit/hooks/receive-notify.pl
@@ -668,30 +668,7 @@ ($)
     my ($ref) = @_;
     my $branch = "";
 
-    if ($ref =~ m/refs\/changes\//) {
-        print "Detected accepted Gerrit Changeset. Parsing for accepted patches...\n";
-        $ref =~ s/\/meta$//;
-        # This is kind of shite.  Gerrit gives us "refs/changes/79/1679/meta" while
-        # merging the "patchset id" into master. (refs/changes/79/1679/3 for example)
-        # We run git branch --contains refs/changes/79/1679/1..50 searching for the
-        # accepted patchset. Please improve if you can.
-        foreach my $patchset (0..50) {
-            if ($branch ne "") {
-                next;
-            }
-            open BRANCHES, "-|" or exec "git", "branch", "--contains", "$ref/$patchset" or die "cannot exec git-branch";
-            map
-            {
-            chomp;
-                die "invalid branch $_" unless /^.*[0-9a-f]*$/;
-                $branch = $_;
-                $branch =~ s/^\s*\**\s*//;
-                print $branch;
-                $branch
-            } <BRANCHES>;
-            close BRANCHES;
-        }
-    } elsif ($ref =~ m/refs\/heads\//) {
+    if ($ref =~ m/refs\/heads\//) {
         print "Detected direct commit to branch.\n";
         $branch = $ref;
         $branch =~ s/refs\/heads\///;

diff --git a/data/gerrit/hooks/ref-updated b/data/gerrit/hooks/ref-updated
@@ -7,9 +7,9 @@
 # Close stdout, close stderr, redirect stdout to log, redirect stderr to log
 #
 LOG="/tmp/notify"
-exec 1<&-
-exec 2<&-
-exec 1<>$LOG
+#exec 1<&-
+#exec 2<&-
+exec 1>$LOG
 exec 2>&1
 
 PROJECT=""
@@ -58,6 +58,11 @@ fi
 echo "DEBUG: THE UPLOADER_EMAIL is: $UPLOADER_EMAIL"
 echo "DEBUG: THE UPLOADER_USERNAME is: $UPLOADER_USERNAME"
 
+if [[ "$REFNAME" =~ "refs/changes/" ]]; then
+        echo "WARNING: Skipping git changeset ref!"
+        exit 0
+fi
+
 echo "Obtaining lock..."
 
 lockfile=$GIT_DIR/receive.lock