3 test_description
='git p4 preserve users'
7 test_expect_success
'start p4d' '
11 test_expect_success
'create files' '
14 p4 client -o | sed "/LineEnd/s/:.*/:unix/" | p4 client -i &&
18 p4 submit -d "add files"
26 echo " admin user $name * //depot/..."
30 p4_check_commit_author
() {
32 p4 changes
-m 1 //depot
/$file |
grep -q $user
35 make_change_by_user
() {
36 file=$1 name
=$2 email
=$3 &&
37 echo "username: a change by $name" >>"$file" &&
39 git commit
--author "$name <$email>" -m "a change by $name"
42 # Test username support, submitting as user 'alice'
43 test_expect_success
'preserve users' '
46 p4_grant_admin alice &&
47 git p4 clone --dest="$git" //depot &&
48 test_when_finished cleanup_git &&
51 echo "username: a change by alice" >>file1 &&
52 echo "username: a change by bob" >>file2 &&
53 git commit --author "Alice <alice@example.com>" -m "a change by alice" file1 &&
54 git commit --author "Bob <bob@example.com>" -m "a change by bob" file2 &&
55 git config git-p4.skipSubmitEditCheck true &&
56 P4EDITOR="test-chmtime +5" P4USER=alice P4PASSWD=secret &&
57 export P4EDITOR P4USER P4PASSWD &&
58 git p4 commit --preserve-user &&
59 p4_check_commit_author file1 alice &&
60 p4_check_commit_author file2 bob
64 # Test username support, submitting as bob, who lacks admin rights. Should
65 # not submit change to p4 (git diff should show deltas).
66 test_expect_success
'refuse to preserve users without perms' '
67 git p4 clone --dest="$git" //depot &&
68 test_when_finished cleanup_git &&
71 git config git-p4.skipSubmitEditCheck true &&
72 echo "username-noperms: a change by alice" >>file1 &&
73 git commit --author "Alice <alice@example.com>" -m "perms: a change by alice" file1 &&
74 P4EDITOR="test-chmtime +5" P4USER=bob P4PASSWD=secret &&
75 export P4EDITOR P4USER P4PASSWD &&
76 test_must_fail git p4 commit --preserve-user &&
77 ! git diff --exit-code HEAD..p4/master
81 # What happens with unknown author? Without allowMissingP4Users it should fail.
82 test_expect_success
'preserve user where author is unknown to p4' '
83 git p4 clone --dest="$git" //depot &&
84 test_when_finished cleanup_git &&
87 git config git-p4.skipSubmitEditCheck true &&
88 echo "username-bob: a change by bob" >>file1 &&
89 git commit --author "Bob <bob@example.com>" -m "preserve: a change by bob" file1 &&
90 echo "username-unknown: a change by charlie" >>file1 &&
91 git commit --author "Charlie <charlie@example.com>" -m "preserve: a change by charlie" file1 &&
92 P4EDITOR="test-chmtime +5" P4USER=alice P4PASSWD=secret &&
93 export P4EDITOR P4USER P4PASSWD &&
94 test_must_fail git p4 commit --preserve-user &&
95 ! git diff --exit-code HEAD..p4/master &&
97 echo "$0: repeat with allowMissingP4Users enabled" &&
98 git config git-p4.allowMissingP4Users true &&
99 git config git-p4.preserveUser true &&
101 git diff --exit-code HEAD..p4/master &&
102 p4_check_commit_author file1 alice
106 # If we're *not* using --preserve-user, git-p4 should warn if we're submitting
107 # changes that are not all ours.
108 # Test: user in p4 and user unknown to p4.
109 # Test: warning disabled and user is the same.
110 test_expect_success
'not preserving user with mixed authorship' '
111 git p4 clone --dest="$git" //depot &&
112 test_when_finished cleanup_git &&
115 git config git-p4.skipSubmitEditCheck true &&
118 make_change_by_user usernamefile3 Derek derek@example.com &&
119 P4EDITOR=cat P4USER=alice P4PASSWD=secret &&
120 export P4EDITOR P4USER P4PASSWD &&
122 grep "git author derek@example.com does not match" &&
124 make_change_by_user usernamefile3 Charlie charlie@example.com &&
126 grep "git author charlie@example.com does not match" &&
128 make_change_by_user usernamefile3 alice alice@example.com &&
130 test_must_fail grep "git author.*does not match" &&
132 git config git-p4.skipUserNameCheck true &&
133 make_change_by_user usernamefile3 Charlie charlie@example.com &&
135 test_must_fail grep "git author.*does not match" &&
137 p4_check_commit_author usernamefile3 alice
141 test_expect_success
'kill p4d' '