From: Junio C Hamano Date: Thu, 22 Jun 2017 21:15:24 +0000 (-0700) Subject: Merge branch 'ps/stash-push-pathspec-fix' X-Git-Tag: v2.14.0-rc0~74 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/49a8bf2edaa7c5922677e1ae04cf44df0c0c8abf?ds=inline;hp=-c Merge branch 'ps/stash-push-pathspec-fix' "git stash push " did not work from a subdirectory at all. Bugfix for a topic in v2.13 * ps/stash-push-pathspec-fix: git-stash: fix pushing stash with pathspec from subdir --- 49a8bf2edaa7c5922677e1ae04cf44df0c0c8abf diff --combined t/t3903-stash.sh index 3b4bed5c9a,d10ddb5b35..4046817d70 --- a/t/t3903-stash.sh +++ b/t/t3903-stash.sh @@@ -812,6 -812,22 +812,22 @@@ test_expect_success 'stash -- stashes in subdirectory' ' + mkdir sub && + >foo && + >bar && + git add foo bar && + ( + cd sub && + git stash push -- ../foo + ) && + test_path_is_file bar && + test_path_is_missing foo && + git stash pop && + test_path_is_file foo && + test_path_is_file bar + ' + test_expect_success 'stash with multiple pathspec arguments' ' >foo && >bar && @@@ -865,7 -881,7 +881,7 @@@ test_expect_success 'stash push -p wit git stash push -p foo >actual && echo "No local changes to save" >expect && git reset --hard HEAD~ && - test_cmp expect actual + test_i18ncmp expect actual ' test_expect_success 'stash push with pathspec shows no changes when there are none' ' @@@ -875,7 -891,7 +891,7 @@@ git stash push foo >actual && echo "No local changes to save" >expect && git reset --hard HEAD~ && - test_cmp expect actual + test_i18ncmp expect actual ' test_expect_success 'stash push with pathspec not in the repository errors out' '