undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'rs/fast-export-pathspec-fix' into maint

Browse Source 
"git fast-export -- <pathspec>" lost the pathspec when showing the
second and subsequent commits, which has been corrected.
source: <2c988c7b-0efe-4222-4a43-8124fe1a9da6@web.de>

* rs/fast-export-pathspec-fix:
  2.36 fast-export regression fix
This commit is contained in:
Junio C Hamano 2022-05-05 14:36:25 -07:00
commit 09a2302c70
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
builtin/fast-export.c
View File

@ -1261,6 +1261,7 @@ int cmd_fast_export(int argc, const char **argv, const char *prefix)
revs.diffopt.format_callback = show_filemodify; revs.diffopt.format_callback = show_filemodify;
revs.diffopt.format_callback_data = &paths_of_changed_objects; revs.diffopt.format_callback_data = &paths_of_changed_objects;
revs.diffopt.flags.recursive = 1; revs.diffopt.flags.recursive = 1;
revs.diffopt.no_free = 1;
while ((commit = get_revision(&revs))) while ((commit = get_revision(&revs)))
handle_commit(commit, &revs, &paths_of_changed_objects); handle_commit(commit, &revs, &paths_of_changed_objects);

7
t/t9350-fast-export.sh
View File

@ -500,6 +500,13 @@ test_expect_success 'path limiting with import-marks does not lose unmodified fi
grep file0 actual grep file0 actual
' '
test_expect_success 'path limiting works' '
git fast-export simple -- file >actual &&
sed -ne "s/^M .* //p" <actual | sort -u >actual.files &&
echo file >expect &&
test_cmp expect actual.files
'
test_expect_success 'avoid corrupt stream with non-existent mark' ' test_expect_success 'avoid corrupt stream with non-existent mark' '
test_create_repo avoid_non_existent_mark && test_create_repo avoid_non_existent_mark &&
( (