diff options
| author | Matthias Beyer <mail@beyermatthias.de> | 2016-05-30 20:43:14 +0200 |
|---|---|---|
| committer | Matthias Beyer <mail@beyermatthias.de> | 2016-05-30 20:43:14 +0200 |
| commit | 9f1d43384da1113f4db2b5010fe57a9f9c16bca3 (patch) | |
| tree | 8140c1157f15459befe265c9cfe8a41c5b9dbd82 | |
| parent | 653eab3b85e8d1de4688443857c8e26714caf094 (diff) | |
| parent | b19d57e417b260bfe79c97f5afef1b520f1872b3 (diff) | |
Merge pull request #118 from matthiasbeyer/fix-117v0.3.2
Call git-am --abort before exiting
| -rwxr-xr-x | nix-script-update-package-def.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/nix-script-update-package-def.sh b/nix-script-update-package-def.sh index 1496891..7b76432 100755 --- a/nix-script-update-package-def.sh +++ b/nix-script-update-package-def.sh @@ -184,6 +184,7 @@ then stdout "Patch applied." else stderr "Patch apply failed. I'm exiting now" + __git "$NIXPKGS" am --abort exit 1 fi |