On Sun, May 4, 2008 at 6:04 PM, Santi Béjar <sbejar@xxxxxxxxx> wrote:
> From: Santi Béjar <sbjear@xxxxxxxxx>
Gggrrr!! I thought I had fixed this. Please remove this line.
Santi
>
> Reorder functions definitions such that determine_author_info is
> defined before prepare_to_commit. No code changes.
>
> Signed-off-by: Santi Béjar <sbejar@xxxxxxxxx>
> ---
> builtin-commit.c | 78 +++++++++++++++++++++++++++---------------------------
> 1 files changed, 39 insertions(+), 39 deletions(-)
>
> diff --git a/builtin-commit.c b/builtin-commit.c
> index 256181a..a37d8c3 100644
> --- a/builtin-commit.c
> +++ b/builtin-commit.c
> @@ -395,6 +395,45 @@ static int is_a_merge(const unsigned char *sha1)
>
> static const char sign_off_header[] = "Signed-off-by: ";
>
> +static void determine_author_info(struct strbuf *sb)
> +{
> + char *name, *email, *date;
> +
> + name = getenv("GIT_AUTHOR_NAME");
> + email = getenv("GIT_AUTHOR_EMAIL");
> + date = getenv("GIT_AUTHOR_DATE");
> +
> + if (use_message) {
> + const char *a, *lb, *rb, *eol;
> +
> + a = strstr(use_message_buffer, "\nauthor ");
> + if (!a)
> + die("invalid commit: %s", use_message);
> +
> + lb = strstr(a + 8, " <");
> + rb = strstr(a + 8, "> ");
> + eol = strchr(a + 8, '\n');
> + if (!lb || !rb || !eol)
> + die("invalid commit: %s", use_message);
> +
> + name = xstrndup(a + 8, lb - (a + 8));
> + email = xstrndup(lb + 2, rb - (lb + 2));
> + date = xstrndup(rb + 2, eol - (rb + 2));
> + }
> +
> + if (force_author) {
> + const char *lb = strstr(force_author, " <");
> + const char *rb = strchr(force_author, '>');
> +
> + if (!lb || !rb)
> + die("malformed --author parameter");
> + name = xstrndup(force_author, lb - force_author);
> + email = xstrndup(lb + 2, rb - (lb + 2));
> + }
> +
> + strbuf_addf(sb, "author %s\n", fmt_ident(name, email, date, IDENT_ERROR_ON_NO_NAME));
> +}
> +
> static int prepare_to_commit(const char *index_file, const char *prefix)
> {
> struct stat statbuf;
> @@ -622,45 +661,6 @@ static int message_is_empty(struct strbuf *sb, int start)
> return 1;
> }
>
> -static void determine_author_info(struct strbuf *sb)
> -{
> - char *name, *email, *date;
> -
> - name = getenv("GIT_AUTHOR_NAME");
> - email = getenv("GIT_AUTHOR_EMAIL");
> - date = getenv("GIT_AUTHOR_DATE");
> -
> - if (use_message) {
> - const char *a, *lb, *rb, *eol;
> -
> - a = strstr(use_message_buffer, "\nauthor ");
> - if (!a)
> - die("invalid commit: %s", use_message);
> -
> - lb = strstr(a + 8, " <");
> - rb = strstr(a + 8, "> ");
> - eol = strchr(a + 8, '\n');
> - if (!lb || !rb || !eol)
> - die("invalid commit: %s", use_message);
> -
> - name = xstrndup(a + 8, lb - (a + 8));
> - email = xstrndup(lb + 2, rb - (lb + 2));
> - date = xstrndup(rb + 2, eol - (rb + 2));
> - }
> -
> - if (force_author) {
> - const char *lb = strstr(force_author, " <");
> - const char *rb = strchr(force_author, '>');
> -
> - if (!lb || !rb)
> - die("malformed --author parameter");
> - name = xstrndup(force_author, lb - force_author);
> - email = xstrndup(lb + 2, rb - (lb + 2));
> - }
> -
> - strbuf_addf(sb, "author %s\n", fmt_ident(name, email, date, IDENT_ERROR_ON_NO_NAME));
> -}
> -
> static int parse_and_validate_options(int argc, const char *argv[],
> const char * const usage[])
> {
> --
> 1.5.5.1.224.gadb29
>
>
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
