mirrors/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-10-28 12:59:41 +01:00
Code Activity

Merge branch 'jk/add-p-unmerged-fix'

Browse source 
"git add -p" while the index is unmerged sometimes failed to parse
the diff output it internally produces and died, which has been
corrected.

* jk/add-p-unmerged-fix:
  add-patch: handle "* Unmerged path" lines
This commit is contained in:
Junio C Hamano 2023-03-19 15:03:13 -07:00
commit a9f4a01760
2 changed files with 23 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
add-patch.c
View file

@ -484,7 +484,8 @@ static int parse_diff(struct add_p_state *s, const struct pathspec *ps)
if (!eol)
eol = pend;
if (starts_with(p, "diff ")) {
if (starts_with(p, "diff ") ||
starts_with(p, "* Unmerged path ")) {
complete_file(marker, hunk);
ALLOC_GROW_BY(s->file_diff, s->file_diff_nr, 1,
file_diff_alloc);

21
t/t3701-add-interactive.sh
View file

@ -1077,4 +1077,25 @@ test_expect_success 'show help from add--helper' '
test_cmp expect actual
'
test_expect_success 'reset -p with unmerged files' '
test_when_finished "git checkout --force main" &&
test_commit one conflict &&
git checkout -B side HEAD^ &&
test_commit two conflict &&
test_must_fail git merge one &&
# this is a noop with only an unmerged entry
git reset -p &&
# add files that sort before and after unmerged entry
echo a >a &&
echo z >z &&
git add a z &&
# confirm that we can reset those files
printf "%s\n" y y | git reset -p &&
git diff-index --cached --diff-filter=u HEAD >staged &&
test_must_be_empty staged
'
test_done