Skip to content

git-p4: a few assorted fixes for branches, excludes

Mazo, Andrey git 3 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v3 Latest8 patches 4 repliesIn review
  2. v27 patches 2 repliesSuperseded
  3. v15 patches 0 repliesSuperseded

Patches in v3 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/8git-p4: detect/prevent infinite loop in gitCommitByP4Change()git-p4.py+3 -10 replies
2/8git-p4: add failing test for "git-p4: match branches case insensitively if configured"t/t9801-git-p4-branch.sh+92 -03 replies
3/8git-p4: match branches case insensitively if configuredgit-p4.py t/t9801-git-p4-branch.sh+4 -40 replies
4/8git-p4: don't groom exclude path list on every commitgit-p4.py+7 -50 replies
5/8git-p4: add failing test for "don't exclude other files with same prefix"t/t9817-git-p4-exclude.sh+46 -50 replies
6/8git-p4: don't exclude other files with same prefixgit-p4.py t/t9817-git-p4-exclude.sh+16 -90 replies
7/8git-p4: add failing test for "git-p4: respect excluded paths when detecting branches"t/t9801-git-p4-branch.sh+40 -00 replies
8/8git-p4: respect excluded paths when detecting branchesgit-p4.py t/t9801-git-p4-branch.sh+2 -30 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v3 yet.

Read the v3 thread

Cover letter [PATCH v3 0/8] git-p4: a few assorted fixes for branches, excludes

This series fixes a few cases with branch detection and handling of excludes by git-p4.

This is the third iteration of the patch series. Changes since v2 [2]:
* Added new test cases for case-insensitive branch detection.
Changes since v1 [1]:
* Added new test case for excluded paths when detecting branches;
* Added a new fix for excluded paths when detecting branches.

[1] https://public-inbox.org/git/[email protected]
[2] https://public-inbox.org/git/[email protected]/

Range-diff vs v2:

1:  3ac39171d4 = 1:  bd009a5ca5 git-p4: detect/prevent infinite loop in gitCommitByP4Change()
2:  e644a8ab49 < -:  ---------- git-p4: match branches case insensitively if configured
-:  ---------- > 2:  68b68ce1e4 git-p4: add failing test for "git-p4: match branches case insensitively if configured"
-:  ---------- > 3:  6eaad2582c git-p4: match branches case insensitively if configured
3:  44fed954dc = 4:  1bd5e170e0 git-p4: don't groom exclude path list on every commit
4:  a0d3fa6add = 5:  b657967154 git-p4: add failing test for "don't exclude other files with same prefix"
5:  3330f88a0d = 6:  035abfff2a git-p4: don't exclude other files with same prefix
6:  6170d45951 = 7:  2bde24b7e4 git-p4: add failing test for "git-p4: respect excluded paths when detecting branches"
7:  758d8e8486 = 8:  6d3ffb98a7 git-p4: respect excluded paths when detecting branches

Andrey Mazo (8):
git-p4: detect/prevent infinite loop in gitCommitByP4Change()
git-p4: add failing test for "git-p4: match branches case insensitively if configured"
git-p4: match branches case insensitively if configured
git-p4: don't groom exclude path list on every commit
git-p4: add failing test for "don't exclude other files with same prefix"
git-p4: don't exclude other files with same prefix
git-p4: add failing test for "git-p4: respect excluded paths when detecting branches"
git-p4: respect excluded paths when detecting branches

 git-p4.py                 |  44 ++++++++-----
 t/t9801-git-p4-branch.sh  | 132 ++++++++++++++++++++++++++++++++++++++
 t/t9817-git-p4-exclude.sh |  51 +++++++++++++--
 3 files changed, 205 insertions(+), 22 deletions(-)

base-commit: 8104ec994ea3849a968b4667d072fedd1e688642

Signature · 1 line
2.19.2