git/t/t9800-git-p4-basic.sh, branch v2.23.2

git p4 test: use 'test_atexit' to kill p4d and the watchdog process

2019-03-14T03:34:39Z

Use 'test_atexit' to run cleanup commands to stop 'p4d' at the end of the test script or upon interrupt or failure, as it is shorter, simpler, and more robust than registering such cleanup commands in the trap on EXIT in the test scripts. Note that one of the test scripts, 't9801-git-p4-branch.sh', stops and then re-starts 'p4d' twice in the middle of the script; take care that the cleanup functions to stop 'p4d' are only registered once. Note also that 'git p4' tests invoke different functions in the trap on EXIT ('cleanup') and in the last test before 'test_done' ('kill_p4d'). Register both of these functions with 'test_atexit' for now, and a a later patch in this series will then clean up the redundancy. Signed-off-by: Johannes Schindelin Signed-off-by: SZEDER Gábor Signed-off-by: Junio C Hamano

git-p4: add the `p4-pre-submit` hook

2018-08-01T20:37:18Z

The `p4-pre-submit` hook is executed before git-p4 submits code. If the hook exits with non-zero value, submit process not start. Signed-off-by: Chen Bin Reviewed-by: Luke Diamand Signed-off-by: Junio C Hamano

Merge branch 'gv/p4-multi-path-commit-fix'

2016-12-27T08:11:43Z

"git p4" that tracks multile p4 paths imported a single changelist that touches files in these multiple paths as one commit, followed by many empty commits. This has been fixed. * gv/p4-multi-path-commit-fix: git-p4: fix multi-path changelist empty commits

git-p4: fix multi-path changelist empty commits

2016-12-19T18:04:21Z

When importing from multiple perforce paths - we may attempt to import a changelist that contains files from two (or more) of these depot paths. Currently, this results in multiple git commits - one containing the changes, and the other(s) as empty commit(s). This behavior was introduced in commit 1f90a64891 ("git-p4: reduce number of server queries for fetches", 2015-12-19). Reproduction Steps: 1. Have a git repo cloned from a perforce repo using multiple depot paths (e.g. //depot/foo and //depot/bar). 2. Submit a single change to the perforce repo that makes changes in both //depot/foo and //depot/bar. 3. Run "git p4 sync" to sync the change from #2. Change is synced as multiple commits, one for each depot path that was affected. Using a set, instead of a list inside p4ChangesForPaths() ensures that each changelist is unique to the returned list, and therefore only a single commit is generated for each changelist. Reported-by: James Farwell Signed-off-by: George Vanburgh Reviewed-by: Luke Diamand Signed-off-by: Junio C Hamano

git-p4: support git worktrees

2016-12-14T00:04:53Z

git-p4 would attempt to find the git directory using its own specific code, which did not know about git worktrees. Rework it to use "git rev-parse --git-dir" instead. Add test cases for worktree usage and specifying git directory via --git-dir and $GIT_DIR. Signed-off-by: Luke Diamand Signed-off-by: Junio C Hamano

git-p4: work with a detached head

2015-11-24T20:20:15Z

When submitting, git-p4 finds the current branch in order to know if it is allowed to submit (configuration "git-p4.allowSubmit"). On a detached head, detecting the branch would fail, and git-p4 would report a cryptic error. This change teaches git-p4 to recognise a detached head and submit successfully. Signed-off-by: Luke Diamand Signed-off-by: Jeff King

git-p4: add failing test for submit from detached head

2015-11-24T20:20:15Z

git-p4 can't submit from a detached head. This test case demonstrates the problem. Signed-off-by: Luke Diamand Signed-off-by: Jeff King

git-p4: add tests for non-numeric revision range

2015-06-10T15:29:10Z

Test that git-p4 can handle a sync with a non-numeric revision range (e.g. a date). Signed-off-by: Luke Diamand Signed-off-by: Junio C Hamano

tests: fix negated test_i18ngrep calls

2014-08-13T20:12:06Z

The helper function test_i18ngrep pretends that it found the expected results when it is running under GETTEXT_POISON. For this reason, it must not be used negated like so ! test_i18ngrep foo bar because the test case would fail under GETTEXT_POISON. The function offers a special syntax to test that a pattern is *not* found: test_i18ngrep ! foo bar Convert incorrect uses to this syntax. Signed-off-by: Johannes Sixt Signed-off-by: Junio C Hamano

git p4: generate better error message for bad depot path

2013-01-27T06:00:38Z

Depot paths must start with //. Exit with a better explanation when a bad depot path is supplied. Signed-off-by: Pete Wyckoff Signed-off-by: Junio C Hamano