Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
t: branch: fix typo
author
Felipe Contreras
<felipe.contreras@gmail.com>
Sat, 31 Aug 2013 04:31:49 +0000
(23:31 -0500)
committer
Junio C Hamano
<gitster@pobox.com>
Tue, 3 Sep 2013 19:14:28 +0000
(12:14 -0700)
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t3200-branch.sh
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
140cd84
)
diff --git
a/t/t3200-branch.sh
b/t/t3200-branch.sh
index ea548f9b982d65599432ade19382e56054eb8aae..3134652f8b7394464d36e432537b270814bde33b 100755
(executable)
--- a/
t/t3200-branch.sh
+++ b/
t/t3200-branch.sh
@@
-351,7
+351,7
@@
test_expect_success 'test overriding tracking setup via --no-track' '
test_expect_success 'no tracking without .fetch entries' '
git config branch.autosetupmerge true &&
git branch my6 s &&
test_expect_success 'no tracking without .fetch entries' '
git config branch.autosetupmerge true &&
git branch my6 s &&
- git config branch.auto
m
setupmerge false &&
+ git config branch.autosetupmerge false &&
test -z "$(git config branch.my6.remote)" &&
test -z "$(git config branch.my6.merge)"
'
test -z "$(git config branch.my6.remote)" &&
test -z "$(git config branch.my6.merge)"
'