]> git.ipfire.org Git - thirdparty/git.git/commit
Merge branch 'am/p4-branches-excludes'
authorJunio C Hamano <gitster@pobox.com>
Tue, 9 Jul 2019 22:25:40 +0000 (15:25 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 9 Jul 2019 22:25:40 +0000 (15:25 -0700)
commit44275f5e1bef37304f5a9da65b588e344eb00a72
treee5e5efaf04d1c549d4a5b919fdc4c46b804b1574
parent99af5bedbda020571995f207e30a617310472a04
parentd15068a6501bec72fddec9f79372a5e3ce5e1379
Merge branch 'am/p4-branches-excludes'

"git p4" update.

* am/p4-branches-excludes:
  git-p4: respect excluded paths when detecting branches
  git-p4: add failing test for "git-p4: respect excluded paths when detecting branches"
  git-p4: don't exclude other files with same prefix
  git-p4: add failing test for "don't exclude other files with same prefix"
  git-p4: don't groom exclude path list on every commit
  git-p4: match branches case insensitively if configured
  git-p4: add failing test for "git-p4: match branches case insensitively if configured"
  git-p4: detect/prevent infinite loop in gitCommitByP4Change()
git-p4.py
t/t9801-git-p4-branch.sh
t/t9817-git-p4-exclude.sh