git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Wink Saville <wink@saville.com>
To: Junio C Hamano <gitster@pobox.com>, jeffhost@microsoft.com
Cc: Git List <git@vger.kernel.org>,
	Eric Sunshine <sunshine@sunshineco.com>,
	Johannes Schindelin <Johannes.Schindelin@gmx.de>
Subject: Re: [RFC PATCH v5 0/8] rebase-interactive
Date: Fri, 23 Mar 2018 22:36:49 -0700	[thread overview]
Message-ID: <CAKk8ispSgNgZxS7KfuOyxfU53tzesvNyLRaNXFZa3K7SCbaRkQ@mail.gmail.com> (raw)
In-Reply-To: <CAKk8isoJQrikitO7ezRajgphUXYR6207k4UkXP6r57WJEFBaDA@mail.gmail.com>

>> I queued everything (with all patch 3-8/8 retitled to share a
>> common prefix, so that "git shortlog" output would stay sane)
>> and I think I resolved the conflicts with Dscho's recreate-merges
>> topic correctly.  Please double check what will appear on 'pu' later
>> today.
>>
>> Thanks.
>>
>
> OK, thank you!

I looked at 'pu' and it LGTM, so I pushed 'pu' as a branch to my
github account to test with Travis-CI. All the linux builds are
green, but the 2 OSX builds are red[1] and the logs show compile
errors:

    CC ident.o
    CC json-writer.o

json-writer.c:123:38:  error:  format specifies type 'uintmax_t' (aka
'unsigned long') but the argument has type 'uint64_t' (aka 'unsigned
long long') [-Werror,-Wformat]

        strbuf_addf(&jw->json, ":%"PRIuMAX, value);
                                 ~~         ^~~~~
json-writer.c:228:37:  error:  format specifies type 'uintmax_t' (aka
'unsigned long') but the argument has type 'uint64_t' (aka 'unsigned
long long') [-Werror,-Wformat] [0m

        strbuf_addf(&jw->json, "%"PRIuMAX, value);
                                 ~~         ^~~~~
2 errors generated.
make: *** [json-writer.o] Error 1
make: *** Waiting for unfinished jobs....

[RFC Patch 1/1] changes the PRIuMax to PRIu64 to correct the compile error
and now Travis-CI is green [2].

[1]: https://travis-ci.org/winksaville/git/builds/357660624
[2]: https://travis-ci.org/winksaville/git/builds/357681929

-- Wink

  reply	other threads:[~2018-03-24  5:37 UTC|newest]

Thread overview: 42+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-03-23  4:39 [RFC PATCH v4] rebase-interactive Wink Saville
2018-03-23  4:39 ` [RFC PATCH v4] rebase-interactive: Simplify pick_on_preserving_merges Wink Saville
2018-03-23 17:10   ` Johannes Schindelin
2018-03-23  4:39 ` [RFC PATCH v4] rebase: Update invocation of rebase dot-sourced scripts Wink Saville
2018-03-23  6:26   ` Eric Sunshine
2018-03-23 21:01     ` Junio C Hamano
2018-03-23 21:18       ` Eric Sunshine
2018-03-23 17:12   ` Johannes Schindelin
2018-03-23 19:06     ` Wink Saville
2018-03-23 20:51       ` Junio C Hamano
2018-03-23 21:05         ` Wink Saville
2018-03-23 21:25 ` [RFC PATCH v5 0/8] rebase-interactive Wink Saville
2018-03-23 21:34   ` Wink Saville
2018-03-23 22:39     ` Junio C Hamano
2018-03-23 22:54       ` Wink Saville
2018-03-24  5:36         ` Wink Saville [this message]
2018-03-26 15:56           ` Junio C Hamano
2018-03-26 17:01             ` Jeff Hostetler
2018-03-26 17:57               ` Junio C Hamano
2018-03-26 18:22                 ` Jeff Hostetler
2018-03-27  5:07                   ` Junio C Hamano
2018-03-27 10:03                     ` Jeff Hostetler
2018-03-26 18:00               ` Junio C Hamano
2018-03-26 18:33                 ` Jeff Hostetler
2018-03-26 18:43                   ` Wink Saville
2018-03-26 19:37                     ` Junio C Hamano
2018-03-26 22:35                     ` Johannes Schindelin
2018-03-23 22:27   ` Junio C Hamano
2018-03-23 21:25 ` [RFC PATCH v5 1/8] rebase-interactive: simplify pick_on_preserving_merges Wink Saville
2018-03-23 21:25 ` [RFC PATCH v5 2/8] rebase: update invocation of rebase dot-sourced scripts Wink Saville
2018-03-23 21:25 ` [RFC PATCH v5 3/8] Indent function git_rebase__interactive Wink Saville
2018-03-23 22:12   ` Junio C Hamano
2018-03-23 22:52     ` Wink Saville
2018-03-23 23:06       ` Junio C Hamano
2018-03-24  0:01         ` Wink Saville
2018-03-23 21:25 ` [RFC PATCH v5 4/8] Extract functions out of git_rebase__interactive Wink Saville
2018-03-23 22:22   ` Junio C Hamano
2018-03-24  7:20   ` Eric Sunshine
2018-03-23 21:25 ` [RFC PATCH v5 5/8] Add and use git_rebase__interactive__preserve_merges Wink Saville
2018-03-23 21:25 ` [RFC PATCH v5 6/8] Remove unused code paths from git_rebase__interactive Wink Saville
2018-03-23 21:25 ` [RFC PATCH v5 7/8] Remove unused code paths from git_rebase__interactive__preserve_merges Wink Saville
2018-03-23 21:25 ` [RFC PATCH v5 8/8] Remove merges_option and a blank line Wink Saville

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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=CAKk8ispSgNgZxS7KfuOyxfU53tzesvNyLRaNXFZa3K7SCbaRkQ@mail.gmail.com \
    --to=wink@saville.com \
    --cc=Johannes.Schindelin@gmx.de \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=jeffhost@microsoft.com \
    --cc=sunshine@sunshineco.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.
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 NNTP newsgroup(s).