diff options
author | lassulus <lassulus@lassul.us> | 2021-01-18 21:13:46 +0100 |
---|---|---|
committer | lassulus <lassulus@lassul.us> | 2021-01-18 21:13:46 +0100 |
commit | c5b36af49fdfac5934edd376c8de84a6947ebd4a (patch) | |
tree | d467593699cad09b06c779f60ce6164d55bf6f20 /krebs/5pkgs/simple/git-preview.nix | |
parent | dba3ca21f28dbb213d6dc44cfc301a958f87a623 (diff) | |
parent | ff6f5ef5e1cdbd27b2211c54643fa2754f888cbb (diff) |
Merge remote-tracking branch 'ni/master'
Diffstat (limited to 'krebs/5pkgs/simple/git-preview.nix')
-rw-r--r-- | krebs/5pkgs/simple/git-preview.nix | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/krebs/5pkgs/simple/git-preview.nix b/krebs/5pkgs/simple/git-preview.nix deleted file mode 100644 index d6c9579a..00000000 --- a/krebs/5pkgs/simple/git-preview.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ coreutils, git, writeDashBin }: - -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_branch=$(${coreutils}/bin/basename "$preview_dir") - ${git}/bin/git worktree add -b "$preview_branch" "$preview_dir" >/dev/null - ${git}/bin/git -C "$preview_dir" checkout "$head_commit" - ${git}/bin/git -C "$preview_dir" merge -m "$merge_message" "$merge_commit" - ${git}/bin/git -C "$preview_dir" diff "$head_commit.." "$@" & - ${git}/bin/git branch -fd "$preview_branch" - ${coreutils}/bin/rm -fR "$preview_dir" - wait -'' |