summaryrefslogtreecommitdiff
path: root/builtin/describe.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-06-14 15:46:13 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-06-14 15:46:14 (GMT)
commitede63a195c53d31207d694258bd8bc740dbc87a7 (patch)
treee2b1eee737f1b7c3af9590f6b8b2a09962ea7537 /builtin/describe.c
parentb27a79d16b21be064c0ac3634928a91e3eee5c01 (diff)
parent4f78c24c63bf0b035afc02372727a3b5897d9835 (diff)
downloadgit-ede63a195c53d31207d694258bd8bc740dbc87a7.zip
git-ede63a195c53d31207d694258bd8bc740dbc87a7.tar.gz
git-ede63a195c53d31207d694258bd8bc740dbc87a7.tar.bz2
Merge branch 'mh/reflife'
Define memory ownership and lifetime rules for what for-each-ref feeds to its callbacks (in short, "you do not own it, so make a copy if you want to keep it"). * mh/reflife: (25 commits) refs: document the lifetime of the args passed to each_ref_fn register_ref(): make a copy of the bad reference SHA-1 exclude_existing(): set existing_refs.strdup_strings string_list_add_refs_by_glob(): add a comment about memory management string_list_add_one_ref(): rename first parameter to "refname" show_head_ref(): rename first parameter to "refname" show_head_ref(): do not shadow name of argument add_existing(): do not retain a reference to sha1 do_fetch(): clean up existing_refs before exiting do_fetch(): reduce scope of peer_item object_array_entry: fix memory handling of the name field find_first_merges(): remove unnecessary code find_first_merges(): initialize merges variable using initializer fsck: don't put a void*-shaped peg in a char*-shaped hole object_array_remove_duplicates(): rewrite to reduce copying revision: use object_array_filter() in implementation of gc_boundary() object_array: add function object_array_filter() revision: split some overly-long lines cmd_diff(): make it obvious which cases are exclusive of each other cmd_diff(): rename local variable "list" -> "entry" ...
Diffstat (limited to 'builtin/describe.c')
-rw-r--r--builtin/describe.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/builtin/describe.c b/builtin/describe.c
index ad84716..4e675c3 100644
--- a/builtin/describe.c
+++ b/builtin/describe.c
@@ -43,7 +43,7 @@ struct commit_name {
unsigned prio:2; /* annotated tag = 2, tag = 1, head = 0 */
unsigned name_checked:1;
unsigned char sha1[20];
- const char *path;
+ char *path;
};
static const char *prio_names[] = {
"head", "lightweight", "annotated",
@@ -127,12 +127,14 @@ static void add_to_known_names(const char *path,
} else {
e->next = NULL;
}
+ e->path = NULL;
}
e->tag = tag;
e->prio = prio;
e->name_checked = 0;
hashcpy(e->sha1, sha1);
- e->path = path;
+ free(e->path);
+ e->path = xstrdup(path);
}
}