diff options
| author | Pete Wyckoff <pw@padd.com> | 2012-04-29 20:57:16 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-04-30 16:00:04 -0700 |
| commit | b6ad6dcc3b0629d525abc9fe0882e1b0eb969e17 (patch) | |
| tree | 9f00b39820b05293dd65097c8aaf5823c77654ea /t/t9807-git-p4-submit.sh | |
| parent | 0f224e5b73a73f37887eb7cb3e51073f889a3f9c (diff) | |
| download | git-b6ad6dcc3b0629d525abc9fe0882e1b0eb969e17.tar.gz git-b6ad6dcc3b0629d525abc9fe0882e1b0eb969e17.tar.xz | |
git p4: fix writable file after rename or copy
The way rename works is with a "p4 integrate", optionally
followed by a "p4 edit" if the change is not a 100% rename.
Contents are generated by applying a patch, not doing a file
system rename. Copy is similar.
In this case, p4 does not fix the permissions back to read-only.
Make sure this happens by calling "p4 sync -f".
Signed-off-by: Pete Wyckoff <pw@padd.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t9807-git-p4-submit.sh')
| -rwxr-xr-x | t/t9807-git-p4-submit.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/t/t9807-git-p4-submit.sh b/t/t9807-git-p4-submit.sh index a2499ee02..f23b4c362 100755 --- a/t/t9807-git-p4-submit.sh +++ b/t/t9807-git-p4-submit.sh @@ -158,7 +158,8 @@ test_expect_success 'submit copy' ' ) && ( cd "$cli" && - test_path_is_file file5.ta + test_path_is_file file5.ta && + test ! -w file5.ta ) ' @@ -176,7 +177,8 @@ test_expect_success 'submit rename' ' ( cd "$cli" && test_path_is_missing file6.t && - test_path_is_file file6.ta + test_path_is_file file6.ta && + test ! -w file6.ta ) ' |