mirror of
https://github.com/git/git.git
synced 2025-12-12 20:36:24 +01:00
89b4183efe
After a partial stash, we may clear out the working tree by capturing the output of diff-tree and piping it into git-apply (and likewise we may use diff-index to restore the index). So we most definitely do not want color diff output from that diff-tree process. And it normally would not produce any, since its stdout is not going to a tty, and the default value of color.ui is "auto". However, if GIT_PAGER_IN_USE is set in the environment, that overrides the tty check, and we'll produce a colorized diff that chokes git-apply: $ echo y | GIT_PAGER_IN_USE=1 git stash -p [...] Saved working directory and index state WIP on main: 4f2e2bb foo error: No valid patches in input (allow with "--allow-empty") Cannot remove worktree changes Setting this variable is a relatively silly thing to do, and not something most users would run into. But we sometimes do it in our tests to stimulate color. And it is a user-visible bug, so let's fix it rather than work around it in the tests. The root issue here is that diff-tree (and other diff plumbing) should probably not ever produce color by default. It does so not by parsing color.ui, but because of the baked-in "auto" default from4c7f1819b3(make color.ui default to 'auto', 2013-06-10). But changing that is risky; we've had discussions back and forth on the topic over the years. E.g.: https://lore.kernel.org/git/86D0A377-8AFD-460D-A90E-6327C6934DFC@gmail.com/. So let's accept that as the status quo for now and protect ourselves by passing --no-color to the child processes. This is the same thing we did for add-interactive itself in1c6ffb546b(add--interactive.perl: specify --no-color explicitly, 2020-09-07). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
130 lines
3.4 KiB
Bash
Executable File
130 lines
3.4 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='stash -p'
|
|
|
|
. ./lib-patch-mode.sh
|
|
|
|
test_expect_success 'setup' '
|
|
mkdir dir &&
|
|
echo parent > dir/foo &&
|
|
echo dummy > bar &&
|
|
echo committed > HEAD &&
|
|
git add bar dir/foo HEAD &&
|
|
git commit -m initial &&
|
|
test_tick &&
|
|
test_commit second dir/foo head &&
|
|
echo index > dir/foo &&
|
|
git add dir/foo &&
|
|
set_and_save_state bar bar_work bar_index &&
|
|
save_head
|
|
'
|
|
|
|
# note: order of files with unstaged changes: HEAD bar dir/foo
|
|
|
|
test_expect_success 'saying "n" does nothing' '
|
|
set_state HEAD HEADfile_work HEADfile_index &&
|
|
set_state dir/foo work index &&
|
|
test_write_lines n n n | test_must_fail git stash save -p &&
|
|
verify_state HEAD HEADfile_work HEADfile_index &&
|
|
verify_saved_state bar &&
|
|
verify_state dir/foo work index
|
|
'
|
|
|
|
test_expect_success 'git stash -p' '
|
|
test_write_lines y n y | git stash save -p &&
|
|
verify_state HEAD committed HEADfile_index &&
|
|
verify_saved_state bar &&
|
|
verify_state dir/foo head index &&
|
|
git reset --hard &&
|
|
git stash apply &&
|
|
verify_state HEAD HEADfile_work committed &&
|
|
verify_state bar dummy dummy &&
|
|
verify_state dir/foo work head
|
|
'
|
|
|
|
test_expect_success 'git stash -p --no-keep-index' '
|
|
set_state HEAD HEADfile_work HEADfile_index &&
|
|
set_state bar bar_work bar_index &&
|
|
set_state dir/foo work index &&
|
|
test_write_lines y n y | git stash save -p --no-keep-index &&
|
|
verify_state HEAD committed committed &&
|
|
verify_state bar bar_work dummy &&
|
|
verify_state dir/foo head head &&
|
|
git reset --hard &&
|
|
git stash apply --index &&
|
|
verify_state HEAD HEADfile_work HEADfile_index &&
|
|
verify_state bar dummy bar_index &&
|
|
verify_state dir/foo work index
|
|
'
|
|
|
|
test_expect_success 'git stash --no-keep-index -p' '
|
|
set_state HEAD HEADfile_work HEADfile_index &&
|
|
set_state bar bar_work bar_index &&
|
|
set_state dir/foo work index &&
|
|
test_write_lines y n y | git stash save --no-keep-index -p &&
|
|
verify_state HEAD committed committed &&
|
|
verify_state dir/foo head head &&
|
|
verify_state bar bar_work dummy &&
|
|
git reset --hard &&
|
|
git stash apply --index &&
|
|
verify_state HEAD HEADfile_work HEADfile_index &&
|
|
verify_state bar dummy bar_index &&
|
|
verify_state dir/foo work index
|
|
'
|
|
|
|
test_expect_success 'stash -p --no-keep-index -- <pathspec> does not unstage other files' '
|
|
set_state HEAD HEADfile_work HEADfile_index &&
|
|
set_state dir/foo work index &&
|
|
echo y | git stash push -p --no-keep-index -- HEAD &&
|
|
verify_state HEAD committed committed &&
|
|
verify_state dir/foo work index
|
|
'
|
|
|
|
test_expect_success 'none of this moved HEAD' '
|
|
verify_saved_head
|
|
'
|
|
|
|
test_expect_success 'stash -p with split hunk' '
|
|
git reset --hard &&
|
|
cat >test <<-\EOF &&
|
|
aaa
|
|
bbb
|
|
ccc
|
|
EOF
|
|
git add test &&
|
|
git commit -m "initial" &&
|
|
cat >test <<-\EOF &&
|
|
aaa
|
|
added line 1
|
|
bbb
|
|
added line 2
|
|
ccc
|
|
EOF
|
|
printf "%s\n" s n y q |
|
|
git stash -p 2>error &&
|
|
test_must_be_empty error &&
|
|
grep "added line 1" test &&
|
|
! grep "added line 2" test
|
|
'
|
|
|
|
test_expect_success 'stash -p not confused by GIT_PAGER_IN_USE' '
|
|
echo to-stash >test &&
|
|
# Set both GIT_PAGER_IN_USE and TERM. Our goal is to entice any
|
|
# diff subprocesses into thinking that they could output
|
|
# color, even though their stdout is not going into a tty.
|
|
echo y |
|
|
GIT_PAGER_IN_USE=1 TERM=vt100 git stash -p &&
|
|
git diff --exit-code
|
|
'
|
|
|
|
test_expect_success 'index push not confused by GIT_PAGER_IN_USE' '
|
|
echo index >test &&
|
|
git add test &&
|
|
echo working-tree >test &&
|
|
# As above, we try to entice the child diff into using color.
|
|
GIT_PAGER_IN_USE=1 TERM=vt100 git stash push test &&
|
|
git diff --exit-code
|
|
'
|
|
|
|
test_done
|