mirror of
https://github.com/git/git
synced 2024-08-28 20:20:07 +00:00
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
This commit is contained in:
commit
9df9bdda3a
|
@ -838,13 +838,16 @@ static int check_tracking_name(struct remote *remote, void *cb_data)
|
|||
memset(&query, 0, sizeof(struct refspec));
|
||||
query.src = cb->src_ref;
|
||||
if (remote_find_tracking(remote, &query) ||
|
||||
get_sha1(query.dst, cb->dst_sha1))
|
||||
get_sha1(query.dst, cb->dst_sha1)) {
|
||||
free(query.dst);
|
||||
return 0;
|
||||
}
|
||||
if (cb->dst_ref) {
|
||||
free(query.dst);
|
||||
cb->unique = 0;
|
||||
return 0;
|
||||
}
|
||||
cb->dst_ref = xstrdup(query.dst);
|
||||
cb->dst_ref = query.dst;
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
@ -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
|
||||
)
|
||||
|
|
Loading…
Reference in a new issue