From: Brandon Williams <bmwill@google.com>
To: git@vger.kernel.org
Cc: Brandon Williams <bmwill@google.com>,
gitster@pobox.com, sbeller@google.com
Subject: [PATCH v2 3/6] submodule: remove add_oid_to_argv
Date: Mon, 1 May 2017 18:02:36 -0700 [thread overview]
Message-ID: <20170502010239.179369-4-bmwill@google.com> (raw)
In-Reply-To: <20170502010239.179369-1-bmwill@google.com>
The function 'add_oid_to_argv()' provides the same functionality as
'append_oid_to_argv()'. Remove this duplicate function and instead use
'append_oid_to_argv()' where 'add_oid_to_argv()' was previously used.
Change-Id: Id0abea012707460cb7000df761e6557ba5cd88d9
Signed-off-by: Brandon Williams <bmwill@google.com>
---
submodule.c | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/submodule.c b/submodule.c
index 46abd52b1..7baa28ae0 100644
--- a/submodule.c
+++ b/submodule.c
@@ -970,12 +970,6 @@ void check_for_new_submodule_commits(struct object_id *oid)
oid_array_append(&ref_tips_after_fetch, oid);
}
-static int add_oid_to_argv(const struct object_id *oid, void *data)
-{
- argv_array_push(data, oid_to_hex(oid));
- return 0;
-}
-
static void calculate_changed_submodule_paths(void)
{
struct rev_info rev;
@@ -989,10 +983,10 @@ static void calculate_changed_submodule_paths(void)
init_revisions(&rev, NULL);
argv_array_push(&argv, "--"); /* argv[0] program name */
oid_array_for_each_unique(&ref_tips_after_fetch,
- add_oid_to_argv, &argv);
+ append_oid_to_argv, &argv);
argv_array_push(&argv, "--not");
oid_array_for_each_unique(&ref_tips_before_fetch,
- add_oid_to_argv, &argv);
+ append_oid_to_argv, &argv);
setup_revisions(argv.argc, argv.argv, &rev, NULL);
if (prepare_revision_walk(&rev))
die("revision walk setup failed");
--
2.13.0.rc1.294.g07d810a77f-goog
next prev parent reply other threads:[~2017-05-02 1:02 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-28 23:53 [PATCH 0/6] changed submodules Brandon Williams
2017-04-28 23:53 ` [PATCH 1/6] submodule: rename add_sha1_to_array Brandon Williams
2017-05-01 3:18 ` Junio C Hamano
2017-04-28 23:53 ` [PATCH 2/6] submodule: rename free_submodules_sha1s Brandon Williams
2017-04-28 23:53 ` [PATCH 3/6] submodule: remove add_oid_to_argv Brandon Williams
2017-04-28 23:54 ` [PATCH 4/6] submodule: change string_list changed_submodule_paths Brandon Williams
2017-05-01 3:28 ` Junio C Hamano
2017-05-01 16:35 ` Brandon Williams
2017-04-28 23:54 ` [PATCH 5/6] submodule: improve submodule_has_commits Brandon Williams
2017-04-29 0:28 ` Stefan Beller
2017-04-30 23:14 ` Brandon Williams
2017-05-01 16:52 ` Stefan Beller
2017-05-01 16:55 ` Brandon Williams
2017-05-01 3:37 ` Junio C Hamano
2017-05-01 16:46 ` Brandon Williams
2017-04-28 23:54 ` [PATCH 6/6] submodule: refactor logic to determine changed submodules Brandon Williams
2017-04-29 0:53 ` Stefan Beller
2017-05-01 16:49 ` Brandon Williams
2017-05-01 1:42 ` [PATCH 0/6] " Junio C Hamano
2017-05-02 1:02 ` [PATCH v2 " Brandon Williams
2017-05-02 1:02 ` [PATCH v2 1/6] submodule: rename add_sha1_to_array Brandon Williams
2017-05-02 1:05 ` Stefan Beller
2017-05-02 1:09 ` Brandon Williams
2017-05-02 1:02 ` [PATCH v2 2/6] submodule: rename free_submodules_sha1s Brandon Williams
2017-05-02 1:02 ` Brandon Williams [this message]
2017-05-02 1:02 ` [PATCH v2 4/6] submodule: change string_list changed_submodule_paths Brandon Williams
2017-05-02 1:02 ` [PATCH v2 5/6] submodule: improve submodule_has_commits Brandon Williams
2017-05-02 1:34 ` Stefan Beller
2017-05-02 17:25 ` Brandon Williams
2017-05-02 17:55 ` Stefan Beller
2017-05-02 19:14 ` Brandon Williams
2017-05-02 19:30 ` Brandon Williams
2017-05-02 1:02 ` [PATCH v2 6/6] submodule: refactor logic to determine changed submodules Brandon Williams
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170502010239.179369-4-bmwill@google.com \
--to=bmwill@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=sbeller@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).