mirror of
https://github.com/git/git.git
synced 2024-12-04 07:24:41 +08:00
8d676d85f7
* gv/portable:
test-lib: use DIFF definition from GIT-BUILD-OPTIONS
build: propagate $DIFF to scripts
Makefile: Tru64 portability fix
Makefile: HP-UX 10.20 portability fixes
Makefile: HPUX11 portability fixes
Makefile: SunOS 5.6 portability fix
inline declaration does not work on AIX
Allow disabling "inline"
Some platforms lack socklen_t type
Make NO_{INET_NTOP,INET_PTON} configured independently
Makefile: some platforms do not have hstrerror anywhere
git-compat-util.h: some platforms with mmap() lack MAP_FAILED definition
test_cmp: do not use "diff -u" on platforms that lack one
fixup: do not unconditionally disable "diff -u"
tests: use "test_cmp", not "diff", when verifying the result
Do not use "diff" found on PATH while building and installing
enums: omit trailing comma for portability
Makefile: -lpthread may still be necessary when libc has only pthread stubs
Rewrite dynamic structure initializations to runtime assignment
Makefile: pass CPPFLAGS through to fllow customization
Conflicts:
Makefile
wt-status.h
382 lines
8.4 KiB
Bash
Executable File
382 lines
8.4 KiB
Bash
Executable File
#!/bin/sh
|
|
#
|
|
# Copyright (c) 2007 Johannes E Schindelin
|
|
#
|
|
|
|
test_description='Test git stash'
|
|
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success 'stash some dirty working directory' '
|
|
echo 1 > file &&
|
|
git add file &&
|
|
test_tick &&
|
|
git commit -m initial &&
|
|
echo 2 > file &&
|
|
git add file &&
|
|
echo 3 > file &&
|
|
test_tick &&
|
|
git stash &&
|
|
git diff-files --quiet &&
|
|
git diff-index --cached --quiet HEAD
|
|
'
|
|
|
|
cat > expect << EOF
|
|
diff --git a/file b/file
|
|
index 0cfbf08..00750ed 100644
|
|
--- a/file
|
|
+++ b/file
|
|
@@ -1 +1 @@
|
|
-2
|
|
+3
|
|
EOF
|
|
|
|
test_expect_success 'parents of stash' '
|
|
test $(git rev-parse stash^) = $(git rev-parse HEAD) &&
|
|
git diff stash^2..stash > output &&
|
|
test_cmp output expect
|
|
'
|
|
|
|
test_expect_success 'apply needs clean working directory' '
|
|
echo 4 > other-file &&
|
|
git add other-file &&
|
|
echo 5 > other-file &&
|
|
test_must_fail git stash apply
|
|
'
|
|
|
|
test_expect_success 'apply stashed changes' '
|
|
git add other-file &&
|
|
test_tick &&
|
|
git commit -m other-file &&
|
|
git stash apply &&
|
|
test 3 = $(cat file) &&
|
|
test 1 = $(git show :file) &&
|
|
test 1 = $(git show HEAD:file)
|
|
'
|
|
|
|
test_expect_success 'apply stashed changes (including index)' '
|
|
git reset --hard HEAD^ &&
|
|
echo 6 > other-file &&
|
|
git add other-file &&
|
|
test_tick &&
|
|
git commit -m other-file &&
|
|
git stash apply --index &&
|
|
test 3 = $(cat file) &&
|
|
test 2 = $(git show :file) &&
|
|
test 1 = $(git show HEAD:file)
|
|
'
|
|
|
|
test_expect_success 'unstashing in a subdirectory' '
|
|
git reset --hard HEAD &&
|
|
mkdir subdir &&
|
|
cd subdir &&
|
|
git stash apply &&
|
|
cd ..
|
|
'
|
|
|
|
test_expect_success 'drop top stash' '
|
|
git reset --hard &&
|
|
git stash list > stashlist1 &&
|
|
echo 7 > file &&
|
|
git stash &&
|
|
git stash drop &&
|
|
git stash list > stashlist2 &&
|
|
test_cmp stashlist1 stashlist2 &&
|
|
git stash apply &&
|
|
test 3 = $(cat file) &&
|
|
test 1 = $(git show :file) &&
|
|
test 1 = $(git show HEAD:file)
|
|
'
|
|
|
|
test_expect_success 'drop middle stash' '
|
|
git reset --hard &&
|
|
echo 8 > file &&
|
|
git stash &&
|
|
echo 9 > file &&
|
|
git stash &&
|
|
git stash drop stash@{1} &&
|
|
test 2 = $(git stash list | wc -l) &&
|
|
git stash apply &&
|
|
test 9 = $(cat file) &&
|
|
test 1 = $(git show :file) &&
|
|
test 1 = $(git show HEAD:file) &&
|
|
git reset --hard &&
|
|
git stash drop &&
|
|
git stash apply &&
|
|
test 3 = $(cat file) &&
|
|
test 1 = $(git show :file) &&
|
|
test 1 = $(git show HEAD:file)
|
|
'
|
|
|
|
test_expect_success 'stash pop' '
|
|
git reset --hard &&
|
|
git stash pop &&
|
|
test 3 = $(cat file) &&
|
|
test 1 = $(git show :file) &&
|
|
test 1 = $(git show HEAD:file) &&
|
|
test 0 = $(git stash list | wc -l)
|
|
'
|
|
|
|
cat > expect << EOF
|
|
diff --git a/file2 b/file2
|
|
new file mode 100644
|
|
index 0000000..1fe912c
|
|
--- /dev/null
|
|
+++ b/file2
|
|
@@ -0,0 +1 @@
|
|
+bar2
|
|
EOF
|
|
|
|
cat > expect1 << EOF
|
|
diff --git a/file b/file
|
|
index 257cc56..5716ca5 100644
|
|
--- a/file
|
|
+++ b/file
|
|
@@ -1 +1 @@
|
|
-foo
|
|
+bar
|
|
EOF
|
|
|
|
cat > expect2 << EOF
|
|
diff --git a/file b/file
|
|
index 7601807..5716ca5 100644
|
|
--- a/file
|
|
+++ b/file
|
|
@@ -1 +1 @@
|
|
-baz
|
|
+bar
|
|
diff --git a/file2 b/file2
|
|
new file mode 100644
|
|
index 0000000..1fe912c
|
|
--- /dev/null
|
|
+++ b/file2
|
|
@@ -0,0 +1 @@
|
|
+bar2
|
|
EOF
|
|
|
|
test_expect_success 'stash branch' '
|
|
echo foo > file &&
|
|
git commit file -m first
|
|
echo bar > file &&
|
|
echo bar2 > file2 &&
|
|
git add file2 &&
|
|
git stash &&
|
|
echo baz > file &&
|
|
git commit file -m second &&
|
|
git stash branch stashbranch &&
|
|
test refs/heads/stashbranch = $(git symbolic-ref HEAD) &&
|
|
test $(git rev-parse HEAD) = $(git rev-parse master^) &&
|
|
git diff --cached > output &&
|
|
test_cmp output expect &&
|
|
git diff > output &&
|
|
test_cmp output expect1 &&
|
|
git add file &&
|
|
git commit -m alternate\ second &&
|
|
git diff master..stashbranch > output &&
|
|
test_cmp output expect2 &&
|
|
test 0 = $(git stash list | wc -l)
|
|
'
|
|
|
|
test_expect_success 'apply -q is quiet' '
|
|
echo foo > file &&
|
|
git stash &&
|
|
git stash apply -q > output.out 2>&1 &&
|
|
test ! -s output.out
|
|
'
|
|
|
|
test_expect_success 'save -q is quiet' '
|
|
git stash save --quiet > output.out 2>&1 &&
|
|
test ! -s output.out
|
|
'
|
|
|
|
test_expect_success 'pop -q is quiet' '
|
|
git stash pop -q > output.out 2>&1 &&
|
|
test ! -s output.out
|
|
'
|
|
|
|
test_expect_success 'pop -q --index works and is quiet' '
|
|
echo foo > file &&
|
|
git add file &&
|
|
git stash save --quiet &&
|
|
git stash pop -q --index > output.out 2>&1 &&
|
|
test foo = "$(git show :file)" &&
|
|
test ! -s output.out
|
|
'
|
|
|
|
test_expect_success 'drop -q is quiet' '
|
|
git stash &&
|
|
git stash drop -q > output.out 2>&1 &&
|
|
test ! -s output.out
|
|
'
|
|
|
|
test_expect_success 'stash -k' '
|
|
echo bar3 > file &&
|
|
echo bar4 > file2 &&
|
|
git add file2 &&
|
|
git stash -k &&
|
|
test bar,bar4 = $(cat file),$(cat file2)
|
|
'
|
|
|
|
test_expect_success 'stash --invalid-option' '
|
|
echo bar5 > file &&
|
|
echo bar6 > file2 &&
|
|
git add file2 &&
|
|
test_must_fail git stash --invalid-option &&
|
|
test_must_fail git stash save --invalid-option &&
|
|
test bar5,bar6 = $(cat file),$(cat file2) &&
|
|
git stash -- -message-starting-with-dash &&
|
|
test bar,bar2 = $(cat file),$(cat file2)
|
|
'
|
|
|
|
test_expect_success 'stash an added file' '
|
|
git reset --hard &&
|
|
echo new >file3 &&
|
|
git add file3 &&
|
|
git stash save "added file" &&
|
|
! test -r file3 &&
|
|
git stash apply &&
|
|
test new = "$(cat file3)"
|
|
'
|
|
|
|
test_expect_success 'stash rm then recreate' '
|
|
git reset --hard &&
|
|
git rm file &&
|
|
echo bar7 >file &&
|
|
git stash save "rm then recreate" &&
|
|
test bar = "$(cat file)" &&
|
|
git stash apply &&
|
|
test bar7 = "$(cat file)"
|
|
'
|
|
|
|
test_expect_success 'stash rm and ignore' '
|
|
git reset --hard &&
|
|
git rm file &&
|
|
echo file >.gitignore &&
|
|
git stash save "rm and ignore" &&
|
|
test bar = "$(cat file)" &&
|
|
test file = "$(cat .gitignore)"
|
|
git stash apply &&
|
|
! test -r file &&
|
|
test file = "$(cat .gitignore)"
|
|
'
|
|
|
|
test_expect_success 'stash rm and ignore (stage .gitignore)' '
|
|
git reset --hard &&
|
|
git rm file &&
|
|
echo file >.gitignore &&
|
|
git add .gitignore &&
|
|
git stash save "rm and ignore (stage .gitignore)" &&
|
|
test bar = "$(cat file)" &&
|
|
! test -r .gitignore
|
|
git stash apply &&
|
|
! test -r file &&
|
|
test file = "$(cat .gitignore)"
|
|
'
|
|
|
|
test_expect_success SYMLINKS 'stash file to symlink' '
|
|
git reset --hard &&
|
|
rm file &&
|
|
ln -s file2 file &&
|
|
git stash save "file to symlink" &&
|
|
test -f file &&
|
|
test bar = "$(cat file)" &&
|
|
git stash apply &&
|
|
case "$(ls -l file)" in *" file -> file2") :;; *) false;; esac
|
|
'
|
|
|
|
test_expect_success SYMLINKS 'stash file to symlink (stage rm)' '
|
|
git reset --hard &&
|
|
git rm file &&
|
|
ln -s file2 file &&
|
|
git stash save "file to symlink (stage rm)" &&
|
|
test -f file &&
|
|
test bar = "$(cat file)" &&
|
|
git stash apply &&
|
|
case "$(ls -l file)" in *" file -> file2") :;; *) false;; esac
|
|
'
|
|
|
|
test_expect_success SYMLINKS 'stash file to symlink (full stage)' '
|
|
git reset --hard &&
|
|
rm file &&
|
|
ln -s file2 file &&
|
|
git add file &&
|
|
git stash save "file to symlink (full stage)" &&
|
|
test -f file &&
|
|
test bar = "$(cat file)" &&
|
|
git stash apply &&
|
|
case "$(ls -l file)" in *" file -> file2") :;; *) false;; esac
|
|
'
|
|
|
|
# This test creates a commit with a symlink used for the following tests
|
|
|
|
test_expect_success SYMLINKS 'stash symlink to file' '
|
|
git reset --hard &&
|
|
ln -s file filelink &&
|
|
git add filelink &&
|
|
git commit -m "Add symlink" &&
|
|
rm filelink &&
|
|
cp file filelink &&
|
|
git stash save "symlink to file" &&
|
|
test -h filelink &&
|
|
case "$(ls -l filelink)" in *" filelink -> file") :;; *) false;; esac &&
|
|
git stash apply &&
|
|
! test -h filelink &&
|
|
test bar = "$(cat file)"
|
|
'
|
|
|
|
test_expect_success SYMLINKS 'stash symlink to file (stage rm)' '
|
|
git reset --hard &&
|
|
git rm filelink &&
|
|
cp file filelink &&
|
|
git stash save "symlink to file (stage rm)" &&
|
|
test -h filelink &&
|
|
case "$(ls -l filelink)" in *" filelink -> file") :;; *) false;; esac &&
|
|
git stash apply &&
|
|
! test -h filelink &&
|
|
test bar = "$(cat file)"
|
|
'
|
|
|
|
test_expect_success SYMLINKS 'stash symlink to file (full stage)' '
|
|
git reset --hard &&
|
|
rm filelink &&
|
|
cp file filelink &&
|
|
git add filelink &&
|
|
git stash save "symlink to file (full stage)" &&
|
|
test -h filelink &&
|
|
case "$(ls -l filelink)" in *" filelink -> file") :;; *) false;; esac &&
|
|
git stash apply &&
|
|
! test -h filelink &&
|
|
test bar = "$(cat file)"
|
|
'
|
|
|
|
test_expect_failure 'stash directory to file' '
|
|
git reset --hard &&
|
|
mkdir dir &&
|
|
echo foo >dir/file &&
|
|
git add dir/file &&
|
|
git commit -m "Add file in dir" &&
|
|
rm -fr dir &&
|
|
echo bar >dir &&
|
|
git stash save "directory to file" &&
|
|
test -d dir &&
|
|
test foo = "$(cat dir/file)" &&
|
|
test_must_fail git stash apply &&
|
|
test bar = "$(cat dir)" &&
|
|
git reset --soft HEAD^
|
|
'
|
|
|
|
test_expect_failure 'stash file to directory' '
|
|
git reset --hard &&
|
|
rm file &&
|
|
mkdir file &&
|
|
echo foo >file/file &&
|
|
git stash save "file to directory" &&
|
|
test -f file &&
|
|
test bar = "$(cat file)" &&
|
|
git stash apply &&
|
|
test -f file/file &&
|
|
test foo = "$(cat file/file)"
|
|
'
|
|
|
|
test_done
|