mirror of
https://git.savannah.gnu.org/git/coreutils.git
synced 2025-07-29 12:21:15 +03:00
maint: choose editor in the commit-msg git hook the same way git does
Git honours the GIT_EDITOR environment variable, the "core.editor" Git configuration variable, and the EDITOR environment variable (in that order, and defaulting to "vi" if none of them is set) to decide which editor should be invoked for the user when he has to or want to edit his commit message. However, our commit-msg hook, when invoking an editor on behalf of the user to allow him to fix a non-policy-complaint commit message, only honoured the EDITOR environment variable. To avoid potential annoying inconsistencies, we should really use the same logic used by Git in the selection of the editor. Luckily, we don't have to duplicate this logic (that would be brittle in the long term), as we can rely on the "git var" command, designed exactly to be used in situations like this. * scripts/git-hooks ($editor): Adjust definition.
This commit is contained in:
committed by
Pádraig Brady
parent
bf7b0e0358
commit
5bff307bdb
@ -6,7 +6,10 @@ use strict;
|
||||
use warnings;
|
||||
(my $ME = $0) =~ s|.*/||;
|
||||
|
||||
my $editor = $ENV{EDITOR} || 'vi';
|
||||
# Emulate Git's choice of the editor for the commit message.
|
||||
chomp (my $editor = `git var GIT_EDITOR`);
|
||||
# And have a sane, minimal fallback in case of weird failures.
|
||||
$editor = "vi" if $? != 0 or $editor =~ /^\s*\z/;
|
||||
|
||||
# Keywords allowed before the colon on the first line of a commit message:
|
||||
# program names and a few general category names.
|
||||
|
Reference in New Issue
Block a user