diff options
author | Jiang Xin <worldhello.net@gmail.com> | 2019-07-30 09:56:16 +0800 |
---|---|---|
committer | Jiang Xin <worldhello.net@gmail.com> | 2019-07-30 09:56:16 +0800 |
commit | eccd872c765a31cdbd9d7a7be6302bd19e736f9b (patch) | |
tree | a9b1fc5a7ebd0386c457a68bb85037ee65d9970f /t/t2014-checkout-switch.sh | |
parent | l10n: de.po: Fix typo in German translation (diff) | |
parent | Git 2.23-rc0 (diff) | |
download | tgif-eccd872c765a31cdbd9d7a7be6302bd19e736f9b.tar.xz |
Merge tag 'v2.23.0-rc0' of git://git.kernel.org/pub/scm/git/git
Git 2.23-rc0
* tag 'v2.23.0-rc0' of git://git.kernel.org/pub/scm/git/git: (420 commits)
Git 2.23-rc0
Merge fixes made on the 'master' front
Flush fixes up to the third batch post 2.22.0
The seventh batch
git: mark cmd_rebase as requiring a worktree
rebase: fix white-space
xdiff: clamp function context indices in post-image
grep: print the pcre2_jit_on value
t6200: use test_commit_bulk
travis-ci: build with GCC 4.8 as well
The sixth batch
clean: show an error message when the path is too long
CodingGuidelines: spell out post-C89 rules
README: fix rendering of text in angle brackets
rm: resolving by removal is not a warning-worthy event
transport-helper: avoid var decl in for () loop control
stash: fix handling removed files with --keep-index
mingw: support spawning programs containing spaces in their names
gpg-interface: do not scan past the end of buffer
tests: defang pager tests by explicitly disabling the log.mailmap warning
...
Diffstat (limited to 't/t2014-checkout-switch.sh')
-rwxr-xr-x | t/t2014-checkout-switch.sh | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/t/t2014-checkout-switch.sh b/t/t2014-checkout-switch.sh new file mode 100755 index 0000000000..ccfb147113 --- /dev/null +++ b/t/t2014-checkout-switch.sh @@ -0,0 +1,28 @@ +#!/bin/sh + +test_description='Peter MacMillan' +. ./test-lib.sh + +test_expect_success setup ' + echo Hello >file && + git add file && + test_tick && + git commit -m V1 && + echo Hello world >file && + git add file && + git checkout -b other +' + +test_expect_success 'check all changes are staged' ' + git diff --exit-code +' + +test_expect_success 'second commit' ' + git commit -m V2 +' + +test_expect_success 'check' ' + git diff --cached --exit-code +' + +test_done |