mirror of
https://github.com/kmein/niveum
synced 2026-03-16 10:11:08 +01:00
git-preview: remove
This commit is contained in:
@@ -17,7 +17,6 @@ in {
|
|||||||
pkgs.gitstats
|
pkgs.gitstats
|
||||||
pkgs.patch
|
pkgs.patch
|
||||||
pkgs.patchutils
|
pkgs.patchutils
|
||||||
inputs.self.packages.${pkgs.system}.git-preview
|
|
||||||
];
|
];
|
||||||
|
|
||||||
environment.shellAliases = {
|
environment.shellAliases = {
|
||||||
|
|||||||
@@ -360,7 +360,6 @@
|
|||||||
fkill = pkgs.callPackage packages/fkill.nix {};
|
fkill = pkgs.callPackage packages/fkill.nix {};
|
||||||
fzfmenu = pkgs.callPackage packages/fzfmenu.nix {};
|
fzfmenu = pkgs.callPackage packages/fzfmenu.nix {};
|
||||||
gfs-fonts = pkgs.callPackage packages/gfs-fonts.nix {};
|
gfs-fonts = pkgs.callPackage packages/gfs-fonts.nix {};
|
||||||
git-preview = pkgs.callPackage packages/git-preview.nix {};
|
|
||||||
gpt35 = pkgs.callPackage packages/gpt.nix {model = "gpt-3.5-turbo";};
|
gpt35 = pkgs.callPackage packages/gpt.nix {model = "gpt-3.5-turbo";};
|
||||||
gpt4 = pkgs.callPackage packages/gpt.nix {model = "gpt-4";};
|
gpt4 = pkgs.callPackage packages/gpt.nix {model = "gpt-4";};
|
||||||
hc = pkgs.callPackage packages/hc.nix {};
|
hc = pkgs.callPackage packages/hc.nix {};
|
||||||
|
|||||||
@@ -1,23 +0,0 @@
|
|||||||
{
|
|
||||||
coreutils,
|
|
||||||
git,
|
|
||||||
writers,
|
|
||||||
}:
|
|
||||||
writers.writeDashBin "git-preview" ''
|
|
||||||
set -efu
|
|
||||||
head_commit=$(${git}/bin/git log -1 --format=%H)
|
|
||||||
merge_commit=$1; shift
|
|
||||||
merge_message='Merge for git-preview'
|
|
||||||
preview_dir=$(${coreutils}/bin/mktemp --tmpdir -d git-preview.XXXXXXXX)
|
|
||||||
preview_name=$(${coreutils}/bin/basename "$preview_dir")
|
|
||||||
${git}/bin/git worktree add --detach -f "$preview_dir" 2>/dev/null
|
|
||||||
${git}/bin/git -C "$preview_dir" checkout -q "$head_commit"
|
|
||||||
${git}/bin/git -C "$preview_dir" merge \
|
|
||||||
''${GIT_PREVIEW_MERGE_STRATEGY+-s "$GIT_PREVIEW_MERGE_STRATEGY"} \
|
|
||||||
-m "$merge_message" \
|
|
||||||
-q \
|
|
||||||
"$merge_commit"
|
|
||||||
${git}/bin/git -C "$preview_dir" diff "$head_commit.." "$@"
|
|
||||||
${coreutils}/bin/rm -fR "$preview_dir"
|
|
||||||
${coreutils}/bin/rm -R .git/worktrees/"$preview_name"
|
|
||||||
''
|
|
||||||
Reference in New Issue
Block a user