diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-09-18 14:36:17 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-09-18 14:36:17 -0700 |
| commit | 8db3865936550fe239b11a44ed52230c3c3eb223 (patch) | |
| tree | 7f5edd4e0a0ffa2a09d0c841cb80b6251df4229b /t/lib-git-p4.sh | |
| parent | 3387423870e2efbc0b1bf7478a03320e55d2f0bc (diff) | |
| parent | 6bbfd1372d2aa5b856fc7fb1616cb06c982fcb83 (diff) | |
| download | git-8db3865936550fe239b11a44ed52230c3c3eb223.tar.gz | |
Merge branch 'pw/p4-submit-conflicts'
Add '--conflict' option to git-p4 subcommand to specify what action
to take when conflicts are found during 'p4 submit'.
* pw/p4-submit-conflicts:
git-p4: add submit --conflict option and config varaiable
git p4: add submit --prepare-p4-only option
git p4: add submit --dry-run option
git p4: accept -v for --verbose
git p4: revert deleted files after submit cancel
git p4: rearrange submit template construction
git p4: test clean-up after failed submit, fix added files
git p4: standardize submit cancel due to unchanged template
git p4: move conflict prompt into run, add [q]uit input
git p4: remove submit failure options [a]pply and [w]rite
git p4: gracefully fail if some commits could not be applied
git p4 test: remove bash-ism of combined export/assignment
Diffstat (limited to 't/lib-git-p4.sh')
| -rw-r--r-- | t/lib-git-p4.sh | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/t/lib-git-p4.sh b/t/lib-git-p4.sh index d748c36df5..7061dce7e5 100644 --- a/t/lib-git-p4.sh +++ b/t/lib-git-p4.sh @@ -26,9 +26,10 @@ testid=${this_test#t} git_p4_test_start=9800 P4DPORT=$((10669 + ($testid - $git_p4_test_start))) -export P4PORT=localhost:$P4DPORT -export P4CLIENT=client -export P4EDITOR=: +P4PORT=localhost:$P4DPORT +P4CLIENT=client +P4EDITOR=: +export P4PORT P4CLIENT P4EDITOR db="$TRASH_DIRECTORY/db" cli=$(test-path-utils real_path "$TRASH_DIRECTORY/cli") |