wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-25 10:41:16 +02:00
Code Activity

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

Browse source 
pre-commit/check-merge-conflicts-2: fix use outside dev shell (backport #12373)
This commit is contained in:
mergify[bot] 2025-02-10 14:37:20 +00:00 • committed by GitHub
commit 0f5f24223d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
maintainers/flake-module.nix
View file

@ -35,7 +35,6 @@
echo "ERROR: found merge/patch conflicts in files" echo "ERROR: found merge/patch conflicts in files"
exit 1 exit 1
fi fi
touch $out
''}"; ''}";
}; };
clang-format = { clang-format = {

2
tests/functional/git-hashing/simple.sh Normal file → Executable file
View file

@ -1,3 +1,5 @@
#!/usr/bin/env bash
source common.sh source common.sh
repo="$TEST_ROOT/scratch" repo="$TEST_ROOT/scratch"