Merge pull request #12434 from NixOS/mergify/bp/2.24-maintenance/pr-1…

…2373 pre-commit/check-merge-conflicts-2: fix use outside dev shell (backport #12373)
NixOS · Feb 10, 2025 · 0f5f242 · 0f5f242
2 parents b9e6e00 + fcea626
commit 0f5f242
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/maintainers/flake-module.nix b/maintainers/flake-module.nix
@@ -35,7 +35,6 @@
                 echo "ERROR: found merge/patch conflicts in files"
                 exit 1
               fi
-              touch $out
             ''}";
           };
           clang-format = {

diff --git a/tests/functional/git-hashing/simple.sh b/tests/functional/git-hashing/simple.sh
@@ -1,3 +1,5 @@
+#!/usr/bin/env bash
+
 source common.sh
 
 repo="$TEST_ROOT/scratch"
-Original file line number
+Diff line change
@@ Expand Up / @@ -35,7 +35,6 @@ @@
                     echo "ERROR: found merge/patch conflicts in files"
                     exit 1
                   fi
-                  touch $out
                 ''}";
               };
               clang-format = {
@@ Expand Down @@