summaryrefslogtreecommitdiffstats
path: root/krebs/5pkgs/simple/git-preview
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2018-10-23 19:26:37 +0200
committertv <tv@krebsco.de>2018-10-23 19:26:37 +0200
commit2751c1c3adf1d3140ae9b63bc399f998bb45cd1b (patch)
tree5920e1b5473a36574ac53b5aad698254a614f00d /krebs/5pkgs/simple/git-preview
parent960e66201e35768e4439e59c8fe78b1976b914c4 (diff)
git-preview: add GIT_PREVIEW_MERGE_STRATEGY
Diffstat (limited to 'krebs/5pkgs/simple/git-preview')
-rw-r--r--krebs/5pkgs/simple/git-preview/default.nix6
1 files changed, 5 insertions, 1 deletions
diff --git a/krebs/5pkgs/simple/git-preview/default.nix b/krebs/5pkgs/simple/git-preview/default.nix
index 77826f34b..da1525072 100644
--- a/krebs/5pkgs/simple/git-preview/default.nix
+++ b/krebs/5pkgs/simple/git-preview/default.nix
@@ -9,7 +9,11 @@ writeDashBin "git-preview" ''
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 -qm "$merge_message" "$merge_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"