Bug#1057756: git-filter-repo: the package fails to build from source due to git help changes

2023-12-07 Thread Vladimir Petko
Dear Maintainers,

  Would it be possible to consider a merge request[1] that addresses this
issue?

Best Regards,
 Vladimir.

 [1]
https://salsa.debian.org/python-team/packages/git-filter-repo/-/merge_requests/1


Bug#1057756: git-filter-repo: the package fails to build from source due to git help changes

2023-12-07 Thread Vladimir Petko
Package: git-filter-repo
Version: 2.38.0-1
Severity: important
Tags: ftbfs

Dear Maintainer,

The package fails to build from source in sid chroot due to the help strings
changes in git 2.43

The relevant parts of the build log
---
make[1]: Entering directory '/<>'
t/run_tests


== t9390-filter-repo.sh ==
ok 1 - check: basic -> basic-filename using '--path filename'
ok 2 - check: basic -> basic-twenty using '--path twenty'
ok 3 - check: basic -> basic-ten using '--path ten'
ok 4 - check: basic -> basic-numbers using '--path ten --path twenty'
ok 5 - check: basic -> basic-filename using '--invert-paths --path-glob t*en*'
ok 6 - check: basic -> basic-numbers using '--invert-paths --path-regex
f.*e.*e'
ok 7 - check: basic -> basic-mailmap using '--mailmap ../t9390/sample-mailmap'
ok 8 - check: basic -> basic-replace using '--replace-text ../t9390/sample-
replace'
ok 9 - check: basic -> basic-message using '--replace-message ../t9390/sample-
message'
ok 10 - check: empty -> empty-keepme using '--path keepme'
ok 11 - check: empty -> more-empty-keepme using '--path keepme --prune-
empty=always --prune-degenerate=always'
ok 12 - check: empty -> less-empty-keepme using '--path keepme --prune-
empty=never --prune-degenerate=never'
ok 13 - check: degenerate -> degenerate-keepme using '--path moduleA/keepme'
ok 14 - check: degenerate -> degenerate-moduleA using '--path moduleA'
ok 15 - check: degenerate -> degenerate-globme using '--path-glob *me'
ok 16 - check: degenerate -> degenerate-keepme-noff using '--path
moduleA/keepme --no-ff'
ok 17 - check: unusual -> unusual-filtered using '--path '
ok 18 - check: unusual -> unusual-mailmap using '--mailmap ../t9390/sample-
mailmap'
ok 19 - --path-rename sequences/tiny:sequences/small
ok 20 - --path-rename sequences:numbers
ok 21 - --path-rename-prefix values:numbers
ok 22 - --path-rename squashing
ok 23 - --path-rename inability to squash
ok 24 - --paths-from-file
ok 25 - Mixing filtering and renaming paths, not enough filters
ok 26 - Mixing filtering and renaming paths, enough filters
ok 27 - Mixing filtering and to-subdirectory-filter
ok 28 - --tag-rename
not ok 29 - tag of tag before relevant portion of history
#
#   test_create_repo filtered_tag_of_tag &&
#   (
#   cd filtered_tag_of_tag &&
#   echo contents >file &&
#   git add file &&
#   git commit -m "Initial" &&
#
#   git tag -a -m "Inner Tag" inner_tag HEAD &&
#   git tag -a -m "Outer Tag" outer_tag inner_tag &&
#
#   mkdir subdir &&
#   echo stuff >subdir/whatever &&
#   git add subdir &&
#   git commit -m "Add file in subdir" &&
#
#   git filter-repo --force --subdirectory-filter subdir &&
#
#   git show-ref >refs &&
#   ! grep refs/tags refs &&
#   git log --all --oneline >commits &&
#   test_line_count = 1 commits
#   )
#
ok 30 - --subdirectory-filter
ok 31 - --subdirectory-filter with trailing slash
ok 32 - --to-subdirectory-filter
ok 33 - --use-base-name
ok 34 - refs/replace/ to skip a parent
ok 35 - refs/replace/ to add more initial history
ok 36 - creation/deletion/updating of replace refs
ok 37 - --debug
ok 38 - --dry-run
ok 39 - --dry-run --debug
ok 40 - --dry-run --stdin
ok 41 - --analyze
ok 42 - --analyze --report-dir
ok 43 - --replace-text all options
ok 44 - --replace-text binary zero_byte-0_char
ok 45 - --replace-text binary zero_byte-no_0_char
ok 46 - --replace-text text-file no_zero_byte-zero_char
ok 47 - --strip-blobs-bigger-than
ok 48 - --strip-blobs-with-ids
ok 49 - commit message rewrite
ok 50 - commit hash unchanged if requested
not ok 51 - commit message encoding preserved if requested
#
#   (
#   git init commit_message_encoding &&
#   cd commit_message_encoding &&
#
#   cat >input <<-\EOF &&
#   feature done
#   commit refs/heads/develop
#   mark :1
#   original-oid deadbeefdeadbeefdeadbeefdeadbeefdeadbeef
#   author Just Me  1234567890 -0200
#   committer Just Me  1234567890 -0200
#   encoding iso-8859-7
#   data 5
#   EOF
#
#   printf "Pi: \360\n\ndone\n" >>input &&
#
#   cat input | git fast-import --quiet &&
#   git rev-parse develop >expect &&
#
#   git filter-repo --preserve-commit-encoding --force &&
#   git rev-parse develop >actual &&
#   test_cmp expect actual
#   )
#
ok 52 - commit message rewrite unsuccessful
ok 53 - startup sanity checks
ok 54 - other