Skip to content

resolved formatter type error#201

Merged
ijc merged 1 commit intomoby:masterfrom
andcostello:master
Apr 10, 2018
Merged

resolved formatter type error#201
ijc merged 1 commit intomoby:masterfrom
andcostello:master

Conversation

@cmoad
Copy link

@cmoad cmoad commented Apr 9, 2018

Resolves #200

@ijc
Copy link
Collaborator

ijc commented Apr 9, 2018

Thanks. Please add a signed off by (I wonder where our bot has gotten too...) and while you are there editing the commit message please paste in the original error for the logs.

Copy link
Collaborator

@ijc ijc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Needs updating as commented above (GH won't let me set that flag without this redundant comment).

@cmoad
Copy link
Author

cmoad commented Apr 9, 2018

@ijc I don't understand what I'm missing. I added the sign off and error message to the commit message.

Copy link
Collaborator

@ijc ijc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, seems I missed that you had already made the changes (no notification mail from GH for some reason) so I just wanted to block the merge while our S-o-b bot is being fixed.

This LGTM now, but CI is broken for unrelated reasons. I'm investigating in #202.

@ijc
Copy link
Collaborator

ijc commented Apr 10, 2018

I've added a workaround for the CI breakage in #202 which has now been merged. Please rebase onto current master to pickup the change and force push the change to your branch here. Sorry for the inconvenience.

@cmoad
Copy link
Author

cmoad commented Apr 10, 2018

@ijc Done and done

Copy link
Collaborator

@ijc ijc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks. However you seem to have merged rather than rebased. If you did git pull before then git pull --rebase will probably do the right thing, otherwise a git fetch «remote» && git rebase «remote»/master (where «remote» is the upstream remote not your fork) should do the trick.

Copy link
Collaborator

@ijc ijc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks.

@ijc
Copy link
Collaborator

ijc commented Apr 10, 2018

Oh FFS, now something else is wrong with CI. Sorry, please bear with me.

@ijc
Copy link
Collaborator

ijc commented Apr 10, 2018

#207 will hopefully fix this new one, but I'm afraid that'll mean another rebase once it is merged.

If you are getting sick and tired of this nonsense I'd be happy to carry your patch from here in #204 since it needs it anyway.

@ijc
Copy link
Collaborator

ijc commented Apr 10, 2018

#207 is merged, please rebase again (sorry) or let me know if you would like me to carry the change.

Original error: error: format specifies type 'ssize_t' (aka 'long') but the argument has type 'off_t' (aka 'long long')

Signed-off-by: Charlie Moad <charlie@andcostello.com>
@ijc
Copy link
Collaborator

ijc commented Apr 10, 2018

CI (finally) green, merging. Thanks for you contribution and your patience!

@ijc ijc merged commit 2c66495 into moby:master Apr 10, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants