summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 8fe5aed)
raw | patch | inline | side by side (parent: 8fe5aed)
author | Jonathan Nieder <jrnieder@gmail.com> | |
Tue, 7 Sep 2010 08:22:53 +0000 (03:22 -0500) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Thu, 9 Sep 2010 23:02:47 +0000 (16:02 -0700) |
Although the set_state command is not likely to fail, it is best to
stay in the habit of checking for failures.
Cc: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
stay in the habit of checking for failures.
Cc: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t2016-checkout-patch.sh | patch | blob | history |
index 7657ec190c2620b1eda03522c0f392a2c6f78f5a..a463b13b27fec87e0f4adb1154fea26b0eee73d9 100755 (executable)
'
test_expect_success PERL 'git checkout -p HEAD with change already staged' '
- set_state dir/foo index index
+ set_state dir/foo index index &&
# the third n is to get out in case it mistakenly does not apply
(echo n; echo y; echo n) | git checkout -p HEAD &&
verify_saved_state bar &&