mirror of
https://github.com/git/git.git
synced 2024-11-24 10:26:17 +08:00
9a53219f69
As evidenced by the leak fixes in the previous commit, the "const" in
git_config_get_string_const() clearly misleads people into thinking that
it does not allocate a copy of the string. We can fix this by renaming
it, but it's easier still to just drop it. Of the four remaining
callers:
- The one in git_config_parse_expiry() still needs to allocate, since
that's what its callers expect. We can just use the non-const
version and cast our pointer. Slightly ugly, but the damage is
contained in one spot.
- The two in apply are writing to global "const char *" variables, and
need to continue allocating. We often mark these as const because we
assign default string literals to them. But in this case we don't do
that, so we can just declare them as real "char *" pointers and use
the non-const version.
- The call in checkout doesn't actually need a copy; it can just use
the non-allocating "tmp" version of the function.
The function is also mentioned in the MyFirstContribution document. We
can swap that call out for the non-allocating "tmp" variant, which fits
well in the example given.
We'll drop the "configset" and "repo" variants, as well (which are
unused).
Note that this frees up the "const" name, so we could rename the "tmp"
variant back to that. But let's give some time for topics in flight to
adapt to the new code before doing so (if we do it too soon, the
function semantics will change but the compiler won't alert us).
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
71 lines
1.9 KiB
C
71 lines
1.9 KiB
C
#include "cache.h"
|
|
#include "remote.h"
|
|
#include "refspec.h"
|
|
#include "checkout.h"
|
|
#include "config.h"
|
|
|
|
struct tracking_name_data {
|
|
/* const */ char *src_ref;
|
|
char *dst_ref;
|
|
struct object_id *dst_oid;
|
|
int num_matches;
|
|
const char *default_remote;
|
|
char *default_dst_ref;
|
|
struct object_id *default_dst_oid;
|
|
};
|
|
|
|
#define TRACKING_NAME_DATA_INIT { NULL, NULL, NULL, 0, NULL, NULL, NULL }
|
|
|
|
static int check_tracking_name(struct remote *remote, void *cb_data)
|
|
{
|
|
struct tracking_name_data *cb = cb_data;
|
|
struct refspec_item query;
|
|
memset(&query, 0, sizeof(struct refspec_item));
|
|
query.src = cb->src_ref;
|
|
if (remote_find_tracking(remote, &query) ||
|
|
get_oid(query.dst, cb->dst_oid)) {
|
|
free(query.dst);
|
|
return 0;
|
|
}
|
|
cb->num_matches++;
|
|
if (cb->default_remote && !strcmp(remote->name, cb->default_remote)) {
|
|
struct object_id *dst = xmalloc(sizeof(*cb->default_dst_oid));
|
|
cb->default_dst_ref = xstrdup(query.dst);
|
|
oidcpy(dst, cb->dst_oid);
|
|
cb->default_dst_oid = dst;
|
|
}
|
|
if (cb->dst_ref) {
|
|
free(query.dst);
|
|
return 0;
|
|
}
|
|
cb->dst_ref = query.dst;
|
|
return 0;
|
|
}
|
|
|
|
const char *unique_tracking_name(const char *name, struct object_id *oid,
|
|
int *dwim_remotes_matched)
|
|
{
|
|
struct tracking_name_data cb_data = TRACKING_NAME_DATA_INIT;
|
|
const char *default_remote = NULL;
|
|
if (!git_config_get_string_tmp("checkout.defaultremote", &default_remote))
|
|
cb_data.default_remote = default_remote;
|
|
cb_data.src_ref = xstrfmt("refs/heads/%s", name);
|
|
cb_data.dst_oid = oid;
|
|
for_each_remote(check_tracking_name, &cb_data);
|
|
if (dwim_remotes_matched)
|
|
*dwim_remotes_matched = cb_data.num_matches;
|
|
free(cb_data.src_ref);
|
|
if (cb_data.num_matches == 1) {
|
|
free(cb_data.default_dst_ref);
|
|
free(cb_data.default_dst_oid);
|
|
return cb_data.dst_ref;
|
|
}
|
|
free(cb_data.dst_ref);
|
|
if (cb_data.default_dst_ref) {
|
|
oidcpy(oid, cb_data.default_dst_oid);
|
|
free(cb_data.default_dst_oid);
|
|
return cb_data.default_dst_ref;
|
|
}
|
|
return NULL;
|
|
}
|