diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-06-27 21:29:46 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-06-27 21:29:46 (GMT) |
| commit | 9df9bdda3a2450fe97ba4db61ce4d46c81fbfc16 (patch) | |
| tree | bd38118591f281343c33e9aa9f98428eef23cbb4 /t | |
| parent | fa4bf9edb9300da2688da8a920c506376a14de0a (diff) | |
| parent | 9d58c4a3e3ce3a40262b7ff3cc39ce3b9a93d527 (diff) | |
| download | git-9df9bdda3a2450fe97ba4db61ce4d46c81fbfc16.zip git-9df9bdda3a2450fe97ba4db61ce4d46c81fbfc16.tar.gz git-9df9bdda3a2450fe97ba4db61ce4d46c81fbfc16.tar.bz2 | |
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')
| -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 eeefa67..b0d1d94 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 ) |