diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-06-27 14:29:46 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-06-27 14:29:46 -0700 |
| commit | 9df9bdda3a2450fe97ba4db61ce4d46c81fbfc16 (patch) | |
| tree | bd38118591f281343c33e9aa9f98428eef23cbb4 /t/t9802-git-p4-filetype.sh | |
| parent | Merge branch 'rr/rebase-stash-store' (diff) | |
| parent | t/t9802: explicitly name the upstream branch to use as a base (diff) | |
| download | tgif-9df9bdda3a2450fe97ba4db61ce4d46c81fbfc16.tar.xz | |
Merge branch 'bc/checkout-tracking-name-plug-leak'
Plug a small leak in checkout.
* bc/checkout-tracking-name-plug-leak:
t/t9802: explicitly name the upstream branch to use as a base
builtin/checkout.c: don't leak memory in check_tracking_name
Diffstat (limited to 't/t9802-git-p4-filetype.sh')
| -rwxr-xr-x | t/t9802-git-p4-filetype.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t9802-git-p4-filetype.sh b/t/t9802-git-p4-filetype.sh index eeefa67904..b0d1d94bf4 100755 --- a/t/t9802-git-p4-filetype.sh +++ b/t/t9802-git-p4-filetype.sh @@ -95,7 +95,7 @@ test_expect_success 'gitattributes setting eol=lf produces lf newlines' ' git init && echo "* eol=lf" >.gitattributes && git p4 sync //depot@all && - git checkout master && + git checkout -b master p4/master && test_cmp "$cli"/f-unix-orig f-unix && test_cmp "$cli"/f-win-as-lf f-win ) @@ -109,7 +109,7 @@ test_expect_success 'gitattributes setting eol=crlf produces crlf newlines' ' git init && echo "* eol=crlf" >.gitattributes && git p4 sync //depot@all && - git checkout master && + git checkout -b master p4/master && test_cmp "$cli"/f-unix-as-crlf f-unix && test_cmp "$cli"/f-win-orig f-win ) |