summaryrefslogtreecommitdiff
path: root/remote.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-09-09 12:54:01 -0700
committerJunio C Hamano <gitster@pobox.com>2014-09-09 12:54:02 -0700
commit27fbcf8267ecc484cafdbfe84a3aaf2f373f3e2a (patch)
tree56490341d40640c3ae1b0880d88f1d053862616e /remote.c
parenta75e759e595bf79d69841e6822784164da54ac23 (diff)
parent50b6773287503cb76d1f4020245bbd119c410961 (diff)
downloadgit-27fbcf8267ecc484cafdbfe84a3aaf2f373f3e2a.tar.gz
Merge branch 'sb/plug-leaks'
* sb/plug-leaks: clone.c: don't leak memory in cmd_clone remote.c: don't leak the base branch name in format_tracking_info
Diffstat (limited to 'remote.c')
-rw-r--r--remote.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/remote.c b/remote.c
index 846cd1969c..0e39b2442d 100644
--- a/remote.c
+++ b/remote.c
@@ -1949,7 +1949,7 @@ int stat_tracking_info(struct branch *branch, int *num_ours, int *num_theirs)
int format_tracking_info(struct branch *branch, struct strbuf *sb)
{
int ours, theirs;
- const char *base;
+ char *base;
int upstream_is_gone = 0;
switch (stat_tracking_info(branch, &ours, &theirs)) {
@@ -1965,8 +1965,7 @@ int format_tracking_info(struct branch *branch, struct strbuf *sb)
break;
}
- base = branch->merge[0]->dst;
- base = shorten_unambiguous_ref(base, 0);
+ base = shorten_unambiguous_ref(branch->merge[0]->dst, 0);
if (upstream_is_gone) {
strbuf_addf(sb,
_("Your branch is based on '%s', but the upstream is gone.\n"),
@@ -2012,6 +2011,7 @@ int format_tracking_info(struct branch *branch, struct strbuf *sb)
strbuf_addf(sb,
_(" (use \"git pull\" to merge the remote branch into yours)\n"));
}
+ free(base);
return 1;
}