Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
submodule: change string_list changed_submodule_paths
author
Brandon Williams
<bmwill@google.com>
Fri, 28 Apr 2017 23:54:00 +0000
(16:54 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Mon, 1 May 2017 03:19:15 +0000
(12:19 +0900)
Eliminate a call to 'xstrdup()' by changing the string_list
'changed_submodule_paths' to duplicated strings added to it.
Signed-off-by: Brandon Williams <bmwill@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
submodule.c
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
d1a8460
)
diff --git
a/submodule.c
b/submodule.c
index 7baa28ae05dfa0c5f81121e11a3ce472bf1294a0..3bcf44521b609aa02b5e4de034c942d002f412ec 100644
(file)
--- a/
submodule.c
+++ b/
submodule.c
@@
-20,7
+20,7
@@
static int config_fetch_recurse_submodules = RECURSE_SUBMODULES_ON_DEMAND;
static int config_update_recurse_submodules = RECURSE_SUBMODULES_DEFAULT;
static int parallel_jobs = 1;
static int config_fetch_recurse_submodules = RECURSE_SUBMODULES_ON_DEMAND;
static int config_update_recurse_submodules = RECURSE_SUBMODULES_DEFAULT;
static int parallel_jobs = 1;
-static struct string_list changed_submodule_paths = STRING_LIST_INIT_
NO
DUP;
+static struct string_list changed_submodule_paths = STRING_LIST_INIT_DUP;
static int initialized_fetch_ref_tips;
static struct oid_array ref_tips_before_fetch;
static struct oid_array ref_tips_after_fetch;
static int initialized_fetch_ref_tips;
static struct oid_array ref_tips_before_fetch;
static struct oid_array ref_tips_after_fetch;
@@
-939,7
+939,7
@@
static void submodule_collect_changed_cb(struct diff_queue_struct *q,
struct string_list_item *path;
path = unsorted_string_list_lookup(&changed_submodule_paths, p->two->path);
if (!path && !is_submodule_commit_present(p->two->path, p->two->oid.hash))
struct string_list_item *path;
path = unsorted_string_list_lookup(&changed_submodule_paths, p->two->path);
if (!path && !is_submodule_commit_present(p->two->path, p->two->oid.hash))
- string_list_append(&changed_submodule_paths,
xstrdup(p->two->path)
);
+ string_list_append(&changed_submodule_paths,
p->two->path
);
} else {
/* Submodule is new or was moved here */
/* NEEDSWORK: When the .git directories of submodules
} else {
/* Submodule is new or was moved here */
/* NEEDSWORK: When the .git directories of submodules