summaryrefslogtreecommitdiffstats
path: root/krebs
diff options
context:
space:
mode:
authorlassulus <lass@blue.r>2018-10-30 19:54:22 +0100
committerlassulus <lass@blue.r>2018-10-30 19:54:22 +0100
commitf130c335de0f902b29bad5da60051d6fa2bdef4e (patch)
treef000fa7d227e3bf2e59345cf0073a25a7dfbc657 /krebs
parent228d4acd7b17afb245627f62f8943f418fb1dd8d (diff)
parent212bc39249f9792cbedf2e9a6b3fed90c52c63e7 (diff)
Merge remote-tracking branch 'ni/master'
Diffstat (limited to 'krebs')
-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"