mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'js/builtin-add-p-portability-fix'

Browse Source 
More fixes to "add -p"

* js/builtin-add-p-portability-fix:
  t6132(NO_PERL): do not run the scripted `add -p`
  t3701: test the built-in `add -i` regardless of NO_PERL
  add -p: avoid ambiguous signed/unsigned comparison
This commit is contained in:
Junio C Hamano
2022-09-13 11:38:24 -07:00
parent 76ffa818c7 64ec8efb83
commit e4ffba458f
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
add-patch.c
View File

@ -1560,7 +1560,7 @@ soft_increment:
strbuf_remove(&s->answer, 0, 1); strbuf_remove(&s->answer, 0, 1);
strbuf_trim(&s->answer); strbuf_trim(&s->answer);
i = hunk_index - DISPLAY_HUNKS_LINES / 2; i = hunk_index - DISPLAY_HUNKS_LINES / 2;
if (i < file_diff->mode_change) if (i < (int)file_diff->mode_change)
i = file_diff->mode_change; i = file_diff->mode_change;
while (s->answer.len == 0) { while (s->answer.len == 0) {
i = display_hunks(s, file_diff, i); i = display_hunks(s, file_diff, i);

4
t/t3701-add-interactive.sh
View File

@ -7,9 +7,9 @@ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
. ./test-lib.sh . ./test-lib.sh
. "$TEST_DIRECTORY"/lib-terminal.sh . "$TEST_DIRECTORY"/lib-terminal.sh
if ! test_have_prereq PERL if test_have_prereq !ADD_I_USE_BUILTIN,!PERL
then then
skip_all='skipping add -i tests, perl not available' skip_all='skipping add -i (scripted) tests, perl not available'
test_done test_done
fi fi

6
t/t6132-pathspec-exclude.sh
View File

@ -293,7 +293,11 @@ test_expect_success 'add with all negative' '
test_cmp expect actual test_cmp expect actual
' '
test_expect_success 'add -p with all negative' ' test_lazy_prereq ADD_I_USE_BUILTIN_OR_PERL '
test_have_prereq ADD_I_USE_BUILTIN || test_have_prereq PERL
'
test_expect_success ADD_I_USE_BUILTIN_OR_PERL 'add -p with all negative' '
H=$(git rev-parse HEAD) && H=$(git rev-parse HEAD) &&
git reset --hard $H && git reset --hard $H &&
git clean -f && git clean -f &&