[PATCH 1/4] refs.c: allow passing raw git_committer_info as email to _update_reflog
- From
Ronnie Sahlberg <sahlberg@google.com>
- Date
- Jun 5, 2014, 23:17 UTC
- Message-ID
- <1402010234-7628-2-git-send-email-sahlberg@google.com>
- In-Reply-To
- <1402010234-7628-1-git-send-email-sahlberg@google.com>
In many places in the code we do not have access to the individual fields in the committer data. Instead we might only have access to prebaked data such as what is returned by git_committer_info() containing a string that consists of email, timestamp, zone etc.
This makes it inconvenient to use transaction_update_reflog since it means you would have to first parse git_committer_info before you can call update_reflog.
Add a new flag REFLOG_EMAIL_IS_COMMITTER to _update_reflog to tell it that what we pass in as email is already the fully baked committer string we can use as-is.
Signed-off-by: Ronnie Sahlberg <sahlberg@google.com>
Conflicts: refs.c --- refs.c | 20 ++++++++++++-------- refs.h | 1 + 2 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/refs.c b/refs.c index 9689592..e3a0383 100644 --- a/refs.c +++ b/refs.c @@ -3489,14 +3489,18 @@ int transaction_update_reflog(struct ref_transaction *transaction, hashcpy(update->old_sha1, old_sha1); update->reflog_fd = -1; if (email) { - struct strbuf buf = STRBUF_INIT; - char sign = (tz < 0) ? '-' : '+'; - int zone = (tz < 0) ? (-tz) : tz; - - strbuf_addf(&buf, "%s %lu %c%04d", email, timestamp, sign, - zone); - update->committer = xstrdup(buf.buf); - strbuf_release(&buf); + if (flags & REFLOG_EMAIL_IS_COMMITTER) + update->committer = xstrdup(email); + else { + struct strbuf buf = STRBUF_INIT; + char sign = (tz < 0) ? '-' : '+'; + int zone = (tz < 0) ? (-tz) : tz; + + strbuf_addf(&buf, "%s %lu %c%04d", email, timestamp, + sign, zone); + update->committer = xstrdup(buf.buf); + strbuf_release(&buf); + } } if (msg) update->msg = xstrdup(msg); diff --git a/refs.h b/refs.h index 1b6a055..3c99619 100644 --- a/refs.h +++ b/refs.h @@ -318,6 +318,7 @@ int transaction_delete_sha1(struct ref_transaction *transaction, struct strbuf *err); #define REFLOG_TRUNCATE 0x01 +#define REFLOG_EMAIL_IS_COMMITTER 0x02 /* * Append a reflog entry for refname. If the REFLOG_TRUNCATE flag is set * this update will first truncate the reflog before writing the entry.
-- 2.0.0.583.g402232d