diff options
| author | Malf Furious <m@lfurio.us> | 2017-09-06 03:45:16 -0400 |
|---|---|---|
| committer | Malf Furious <m@lfurio.us> | 2017-09-06 03:45:16 -0400 |
| commit | d8e9ca30edd02b0c6809cd856db5caf086a4b788 (patch) | |
| tree | 936ce0cdcc56df964f1fedb6dccb8b7bef120c0b | |
| parent | 8907b67e1fb043da87696ce7662e6a12922f80eb (diff) | |
| download | systrunk-d8e9ca30edd02b0c6809cd856db5caf086a4b788.tar.gz systrunk-d8e9ca30edd02b0c6809cd856db5caf086a4b788.zip | |
Spawn merge helper routines in a subshell
This is to prevent those functions from overwriting variables used by
the merge function.
| -rw-r--r-- | merge.sh | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -105,7 +105,7 @@ function systr_merge commit="$1" - systr_merge_tree "$commit" + (systr_merge_tree "$commit") echo "$commit" >.systr/MERG # resolve conflicts # @@ -163,7 +163,7 @@ function systr_merge done # apply merge # - systr_merge_finish "$commit" + (systr_merge_finish "$commit") } ## |