aboutsummaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-01-17 15:11:07 -0800
committerJunio C Hamano <gitster@pobox.com>2017-01-17 15:11:08 -0800
commitaa83f7a2a4a677e9eca4a599f47e027ad06716d1 (patch)
tree8ac18913cd47a341f829c0c96d788b4746f57bd3 /t
parentaf04b1171b9ed16f5acce0a49fe3bda518a40b7e (diff)
parentdf8a9e86db13f2b8becfde8ed69f80127ba14e20 (diff)
downloadgit-aa83f7a2a4a677e9eca4a599f47e027ad06716d1.tar.gz
git-aa83f7a2a4a677e9eca4a599f47e027ad06716d1.tar.xz
Merge branch 'ld/p4-compare-dir-vs-symlink' into maint
"git p4" misbehaved when swapping a directory and a symbolic link. * ld/p4-compare-dir-vs-symlink: git-p4: avoid crash adding symlinked directory
Diffstat (limited to 't')
-rwxr-xr-xt/t9830-git-p4-symlink-dir.sh43
1 files changed, 43 insertions, 0 deletions
diff --git a/t/t9830-git-p4-symlink-dir.sh b/t/t9830-git-p4-symlink-dir.sh
new file mode 100755
index 000000000..3dc528bb1
--- /dev/null
+++ b/t/t9830-git-p4-symlink-dir.sh
@@ -0,0 +1,43 @@
+#!/bin/sh
+
+test_description='git p4 symlinked directories'
+
+. ./lib-git-p4.sh
+
+test_expect_success 'start p4d' '
+ start_p4d
+'
+
+test_expect_success 'symlinked directory' '
+ (
+ cd "$cli" &&
+ : >first_file.t &&
+ p4 add first_file.t &&
+ p4 submit -d "first change"
+ ) &&
+ git p4 clone --dest "$git" //depot &&
+ (
+ cd "$git" &&
+ mkdir -p some/sub/directory &&
+ mkdir -p other/subdir2 &&
+ : > other/subdir2/file.t &&
+ (cd some/sub/directory && ln -s ../../../other/subdir2 .) &&
+ git add some other &&
+ git commit -m "symlinks" &&
+ git config git-p4.skipSubmitEdit true &&
+ git p4 submit -v
+ ) &&
+ (
+ cd "$cli" &&
+ p4 sync &&
+ test -L some/sub/directory/subdir2
+ test_path_is_file some/sub/directory/subdir2/file.t
+ )
+
+'
+
+test_expect_success 'kill p4d' '
+ kill_p4d
+'
+
+test_done