From: Rohit Ashiwal <rohit.ashiwal265@gmail.com>
To: rohit.ashiwal265@gmail.com
Cc: Johannes.Schindelin@gmx.de, git@vger.kernel.org,
gitster@pobox.com, martin.agren@gmail.com, newren@gmail.com,
phillip.wood123@gmail.com, t.gummerer@gmail.com
Subject: [PATCH v5 2/6] sequencer: allow callers of read_author_script() to ignore fields
Date: Fri, 1 Nov 2019 19:29:59 +0530 [thread overview]
Message-ID: <20191101140003.13960-3-rohit.ashiwal265@gmail.com> (raw)
In-Reply-To: <20191101140003.13960-1-rohit.ashiwal265@gmail.com>
The current callers of the read_author_script() function read name,
email and date from the author script. Allow callers to signal that
they are not interested in some among these three fields by passing
NULL.
Note that fields that are ignored still must exist and be formatted
correctly in the author script.
Signed-off-by: Rohit Ashiwal <rohit.ashiwal265@gmail.com>
---
sequencer.c | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/sequencer.c b/sequencer.c
index 9d5964fd81..6954b9eea9 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -823,9 +823,19 @@ int read_author_script(const char *path, char **name, char **email, char **date,
error(_("missing 'GIT_AUTHOR_DATE'"));
if (date_i < 0 || email_i < 0 || date_i < 0 || err)
goto finish;
- *name = kv.items[name_i].util;
- *email = kv.items[email_i].util;
- *date = kv.items[date_i].util;
+
+ if (name)
+ *name = kv.items[name_i].util;
+ else
+ free(kv.items[name_i].util);
+ if (email)
+ *email = kv.items[email_i].util;
+ else
+ free(kv.items[email_i].util);
+ if (date)
+ *date = kv.items[date_i].util;
+ else
+ free(kv.items[date_i].util);
retval = 0;
finish:
string_list_clear(&kv, !!retval);
--
2.21.0
next prev parent reply other threads:[~2019-11-01 14:01 UTC|newest]
Thread overview: 96+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-06 17:36 [GSoC][PATCHl 0/6] rebase -i: support more options Rohit Ashiwal
2019-08-06 17:36 ` [GSoC][PATCHl 1/6] rebase -i: add --ignore-whitespace flag Rohit Ashiwal
2019-08-07 5:38 ` Junio C Hamano
2019-08-07 20:25 ` Rohit Ashiwal
2019-08-08 16:44 ` Phillip Wood
2019-08-12 17:43 ` Rohit Ashiwal
2019-08-06 17:36 ` [GSoC][PATCHl 2/6] sequencer: add NULL checks under read_author_script Rohit Ashiwal
2019-08-06 17:36 ` [GSoC][PATCHl 3/6] rebase -i: support --committer-date-is-author-date Rohit Ashiwal
2019-08-08 11:29 ` Phillip Wood
2019-08-08 16:00 ` Junio C Hamano
2019-08-06 17:36 ` [GSoC][PATCHl 4/6] sequencer: rename amend_author to author_to_rename Rohit Ashiwal
2019-08-08 11:30 ` Phillip Wood
2019-08-06 17:36 ` [GSoC][PATCHl 5/6] rebase -i: support --ignore-date Rohit Ashiwal
2019-08-07 19:41 ` Johannes Schindelin
2019-08-07 20:22 ` Junio C Hamano
2019-08-07 20:33 ` Rohit Ashiwal
2019-08-08 11:42 ` Phillip Wood
2019-08-08 16:53 ` Phillip Wood
2019-08-06 17:36 ` [GSoC][PATCHl 6/6] rebase: add --author-date-is-committer-date Rohit Ashiwal
2019-08-08 11:42 ` Phillip Wood
2019-08-12 19:42 ` [GSoC][PATCH v2 0/6] rebase -i: support more options Rohit Ashiwal
2019-08-12 19:42 ` [GSoC][PATCH v2 1/6] rebase -i: add --ignore-whitespace flag Rohit Ashiwal
2019-08-13 12:07 ` Phillip Wood
2019-08-12 19:42 ` [GSoC][PATCH v2 2/6] sequencer: add NULL checks under read_author_script Rohit Ashiwal
2019-08-12 19:42 ` [GSoC][PATCH v2 3/6] rebase -i: support --committer-date-is-author-date Rohit Ashiwal
2019-08-13 10:38 ` Phillip Wood
2019-08-13 12:09 ` Phillip Wood
2019-08-13 17:06 ` Junio C Hamano
2019-08-14 18:38 ` Phillip Wood
2019-08-13 13:35 ` Phillip Wood
2019-08-12 19:42 ` [GSoC][PATCH v2 4/6] sequencer: rename amend_author to author_to_rename Rohit Ashiwal
2019-08-13 13:29 ` Phillip Wood
2019-08-12 19:42 ` [GSoC][PATCH v2 5/6] rebase -i: support --ignore-date Rohit Ashiwal
2019-08-13 13:28 ` Phillip Wood
2019-08-13 17:21 ` Junio C Hamano
2019-08-14 18:47 ` Phillip Wood
2019-08-13 21:45 ` Junio C Hamano
2019-08-14 18:51 ` Phillip Wood
2019-08-14 19:33 ` Junio C Hamano
2019-08-17 9:28 ` Phillip Wood
2019-08-12 19:43 ` [GSoC][PATCH v2 6/6] rebase: add --author-date-is-committer-date Rohit Ashiwal
2019-08-13 17:28 ` Junio C Hamano
2019-08-20 3:45 ` [PATCH v3 0/6] rebase -i: support more options Rohit Ashiwal
2019-08-20 3:45 ` [PATCH v3 1/6] rebase -i: add --ignore-whitespace flag Rohit Ashiwal
2019-08-20 18:40 ` Phillip Wood
2019-08-20 18:47 ` Rohit Ashiwal
2019-08-20 3:45 ` [PATCH v3 2/6] sequencer: add NULL checks under read_author_script Rohit Ashiwal
2019-08-23 15:20 ` Junio C Hamano
2019-08-20 3:45 ` [PATCH v3 3/6] rebase -i: support --committer-date-is-author-date Rohit Ashiwal
2019-08-20 13:32 ` Phillip Wood
2019-08-20 3:45 ` [PATCH v3 4/6] sequencer: rename amend_author to author_to_rename Rohit Ashiwal
2019-08-20 3:45 ` [PATCH v3 5/6] rebase -i: support --ignore-date Rohit Ashiwal
2019-08-20 13:45 ` Phillip Wood
2019-08-20 17:42 ` Junio C Hamano
2019-08-20 18:30 ` Phillip Wood
2019-08-20 3:45 ` [GSoC][PATCH v2 6/6] rebase: add --author-date-is-committer-date Rohit Ashiwal
2019-08-20 4:00 ` Rohit Ashiwal
2019-08-20 3:45 ` [PATCH v3 6/6] rebase: add --reset-author-date Rohit Ashiwal
2019-08-20 3:54 ` [PATCH v3 0/6] rebase -i: support more options Rohit Ashiwal
2019-08-20 13:56 ` Phillip Wood
2019-08-20 17:53 ` Junio C Hamano
2019-08-20 18:37 ` Phillip Wood
2019-09-07 11:50 ` [PATCH v4 " Rohit Ashiwal
2019-09-07 11:50 ` [PATCH v4 1/6] rebase -i: add --ignore-whitespace flag Rohit Ashiwal
2019-10-04 9:29 ` Phillip Wood
2019-10-05 18:12 ` Elijah Newren
2019-10-06 17:57 ` Rohit Ashiwal
2019-09-07 11:50 ` [PATCH v4 2/6] sequencer: allow callers of read_author_script() to ignore fields Rohit Ashiwal
2019-09-07 11:50 ` [PATCH v4 3/6] rebase -i: support --committer-date-is-author-date Rohit Ashiwal
2019-10-04 9:37 ` Phillip Wood
2019-10-06 17:57 ` Rohit Ashiwal
2019-10-24 13:28 ` Phillip Wood
2019-09-07 11:50 ` [PATCH v4 4/6] sequencer: rename amend_author to author_to_rename Rohit Ashiwal
2019-09-07 11:50 ` [PATCH v4 5/6] rebase -i: support --ignore-date Rohit Ashiwal
2019-09-07 20:56 ` Rohit Ashiwal
2019-09-27 10:00 ` Phillip Wood
2019-10-06 17:57 ` Rohit Ashiwal
2019-10-24 20:36 ` Phillip Wood
2019-09-07 11:50 ` [PATCH v4 6/6] rebase: add --reset-author-date Rohit Ashiwal
2019-09-09 18:02 ` [PATCH v4 0/6] rebase -i: support more options Junio C Hamano
2019-09-09 18:51 ` Phillip Wood
2019-09-09 19:24 ` Junio C Hamano
2019-11-01 13:59 ` [PATCH v5 " Rohit Ashiwal
2019-11-01 13:59 ` [PATCH v5 1/6] rebase -i: add --ignore-whitespace flag Rohit Ashiwal
2019-11-01 13:59 ` Rohit Ashiwal [this message]
2019-11-01 14:00 ` [PATCH v5 3/6] rebase -i: support --committer-date-is-author-date Rohit Ashiwal
2019-11-01 14:00 ` [PATCH v5 4/6] sequencer: rename amend_author to author_to_rename Rohit Ashiwal
2019-11-01 14:00 ` [PATCH v5 5/6] rebase -i: support --ignore-date Rohit Ashiwal
2019-11-02 7:32 ` Junio C Hamano
2019-11-02 7:48 ` Junio C Hamano
2019-11-01 14:00 ` [PATCH v5 6/6] rebase: add --reset-author-date Rohit Ashiwal
2019-11-02 7:34 ` Junio C Hamano
2019-11-21 6:14 ` [PATCH v5 0/6] rebase -i: support more options Junio C Hamano
2019-11-21 8:17 ` Alban Gruin
2019-11-22 6:32 ` Junio C Hamano
2019-11-28 11:14 ` Phillip Wood
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=20191101140003.13960-3-rohit.ashiwal265@gmail.com \
--to=rohit.ashiwal265@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=martin.agren@gmail.com \
--cc=newren@gmail.com \
--cc=phillip.wood123@gmail.com \
--cc=t.gummerer@gmail.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).