Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/src/commitpkg.in
diff options
context:
space:
mode:
authorCampbell Jones <git@serebit.com>2023-03-25 17:53:27 -0400
committerLevente Polyak <anthraxx@archlinux.org>2023-05-20 00:08:12 +0200
commita981ef40e84398475cfe04ac49b8118385249a96 (patch)
tree7de734be950a7f8ca30a2caae12a2e6132b2e555 /src/commitpkg.in
parentfe2eb3076df36c619c22bf65c68e68f38ab39b83 (diff)
edit: improve editor presence checking
Adds a check for the configured Git editor (git config core.editor) in both commitpkg and build.sh. Additionally, instead of blindly executing vi when all other options are exhausted, remove it instead as it is a none standard installed editor anyway. Closes #106 Signed-off-by: Levente Polyak <anthraxx@archlinux.org>
Diffstat (limited to 'src/commitpkg.in')
-rw-r--r--src/commitpkg.in4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/commitpkg.in b/src/commitpkg.in
index 7573d9b..26117dc 100644
--- a/src/commitpkg.in
+++ b/src/commitpkg.in
@@ -198,8 +198,10 @@ if [[ -n $(git status --short --untracked-files=no) ]]; then
$VISUAL "$msgfile" || die
elif [[ -n $EDITOR ]]; then
$EDITOR "$msgfile" || die
+ elif giteditor=$(git config --get core.editor); then
+ $giteditor "$msgfile" || die
else
- vi "$msgfile" || die
+ die "No usable editor found (tried \$GIT_EDITOR, \$VISUAL, \$EDITOR, git config [core.editor])."
fi
[[ -s $msgfile ]] || die
stat_busy 'Committing changes'