Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
t5520: use consistent capitalization in test titles
author
Mehul Jain
<mehul.jain2029@gmail.com>
Sat, 2 Apr 2016 17:58:26 +0000
(23:28 +0530)
committer
Junio C Hamano
<gitster@pobox.com>
Mon, 4 Apr 2016 18:07:01 +0000
(11:07 -0700)
Signed-off-by: Mehul Jain <mehul.jain2029@gmail.com>
Reviewed-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t5520-pull.sh
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
f66398e
)
diff --git
a/t/t5520-pull.sh
b/t/t5520-pull.sh
index 745e59ecf53c2c3466727cef99f3d3eb1c8b54da..5be39df50aa40545765e0808601dc83b050c4322 100755
(executable)
--- a/
t/t5520-pull.sh
+++ b/
t/t5520-pull.sh
@@
-267,7
+267,7
@@
test_expect_success 'pull --rebase --autostash & rebase.autostash=true' '
test "$(cat file)" = "modified again"
'
test "$(cat file)" = "modified again"
'
-test_expect_success 'pull --rebase --autostash & rebase.auto
S
tash=false' '
+test_expect_success 'pull --rebase --autostash & rebase.auto
s
tash=false' '
test_config rebase.autostash false &&
git reset --hard before-rebase &&
echo dirty >new_file &&
test_config rebase.autostash false &&
git reset --hard before-rebase &&
echo dirty >new_file &&
@@
-278,7
+278,7
@@
test_expect_success 'pull --rebase --autostash & rebase.autoStash=false' '
test "$(cat file)" = "modified again"
'
test "$(cat file)" = "modified again"
'
-test_expect_success 'pull --rebase: --autostash & rebase.auto
S
tash unset' '
+test_expect_success 'pull --rebase: --autostash & rebase.auto
s
tash unset' '
git reset --hard before-rebase &&
echo dirty >new_file &&
git add new_file &&
git reset --hard before-rebase &&
echo dirty >new_file &&
git add new_file &&