kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

var: allow GIT_EDITOR to return null 

The handling to die early when there is no EDITOR is valuable when
used in normal code (i.e., editor.c). In git-var, where
null/empty-string is a perfectly valid value to return, it doesn't
make as much sense.

Remove this handling from `git var GIT_EDITOR` so that it does not
fail so noisily when there is no defined editor.

Signed-off-by: Sean Allred <allred.sean@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Sean Allred 2022-11-26 14:17:57 +00:00 committed by Junio C Hamano
parent 26b8abc7b1
commit 2ad150e35e
2 changed files with 63 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
builtin/var.c
View File

@ -11,12 +11,7 @@ static const char var_usage[] = "git var (-l | <variable>)";


static const char *editor(int flag) static const char *editor(int flag)
{ {
const char *pgm = git_editor(); return git_editor();

if (!pgm && flag & IDENT_STRICT)
die("Terminal is dumb, but EDITOR unset");

return pgm;
} }


static const char *pager(int flag) static const char *pager(int flag)

62
t/t0007-git-var.sh
View File

@ -5,6 +5,12 @@ test_description='basic sanity checks for git var'
TEST_PASSES_SANITIZE_LEAK=true TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh . ./test-lib.sh


sane_unset_all_editors () {
sane_unset GIT_EDITOR &&
sane_unset VISUAL &&
sane_unset EDITOR
}

test_expect_success 'get GIT_AUTHOR_IDENT' ' test_expect_success 'get GIT_AUTHOR_IDENT' '
test_tick && test_tick &&
echo "$GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL> $GIT_AUTHOR_DATE" >expect && echo "$GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL> $GIT_AUTHOR_DATE" >expect &&
@ -47,6 +53,62 @@ test_expect_success 'get GIT_DEFAULT_BRANCH with configuration' '
) )
' '


test_expect_success 'get GIT_EDITOR without configuration' '
(
sane_unset_all_editors &&
test_expect_code 1 git var GIT_EDITOR >out &&
test_must_be_empty out
)
'

test_expect_success 'get GIT_EDITOR with configuration' '
test_config core.editor foo &&
(
sane_unset_all_editors &&
echo foo >expect &&
git var GIT_EDITOR >actual &&
test_cmp expect actual
)
'

test_expect_success 'get GIT_EDITOR with environment variable GIT_EDITOR' '
(
sane_unset_all_editors &&
echo bar >expect &&
GIT_EDITOR=bar git var GIT_EDITOR >actual &&
test_cmp expect actual
)
'

test_expect_success 'get GIT_EDITOR with environment variable EDITOR' '
(
sane_unset_all_editors &&
echo bar >expect &&
EDITOR=bar git var GIT_EDITOR >actual &&
test_cmp expect actual
)
'

test_expect_success 'get GIT_EDITOR with configuration and environment variable GIT_EDITOR' '
test_config core.editor foo &&
(
sane_unset_all_editors &&
echo bar >expect &&
GIT_EDITOR=bar git var GIT_EDITOR >actual &&
test_cmp expect actual
)
'

test_expect_success 'get GIT_EDITOR with configuration and environment variable EDITOR' '
test_config core.editor foo &&
(
sane_unset_all_editors &&
echo foo >expect &&
EDITOR=bar git var GIT_EDITOR >actual &&
test_cmp expect actual
)
'

# For git var -l, we check only a representative variable; # For git var -l, we check only a representative variable;
# testing the whole output would make our test too brittle with # testing the whole output would make our test too brittle with
# respect to unrelated changes in the test suite's environment. # respect to unrelated changes in the test suite's environment.