Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

pre-commit/check-merge-conflicts-2: fix use outside dev shell #12373

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

pre-commit/check-merge-conflicts-2: fix use outside dev shell #12373

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f147c9e
pre-commit/check-merge-conflicts-2: fix use outside dev shell
roberth Jan 24, 2025
fd63e56
test: Fix shellcheck by giving git-hashing scripts shebangs
roberth Jan 29, 2025
11962d3
test: Use skipTest instead of exit 0
roberth Jan 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion maintainers/flake-module.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
echo "ERROR: found merge/patch conflicts in files"
exit 1
fi
touch $out
''}";
};
nixfmt-rfc-style = {
Expand Down
Empty file modified tests/functional/git-hashing/fixed.sh
100644 → 100755
View file
Open in desktop
Empty file.
2 changes: 2 additions & 0 deletions tests/functional/git-hashing/simple.sh
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#!/usr/bin/env bash

source common.sh

repo="$TEST_ROOT/scratch"
Expand Down
4 changes: 1 addition & 3 deletions tests/functional/help.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ done

# FIXME: we don't know whether we built the manpages, so we can't
# reliably test them here.
if false; then
skipTest

# test help output

Expand Down Expand Up @@ -74,5 +74,3 @@ nix-daemon --help
nix-hash --help
nix-instantiate --help
nix-prefetch-url --help

fi
Loading