Skip to content

Conversation

@KingsleyKelly
Copy link

This fixes #752

Just added another flag to rm and a test. I'm not sure if this is addressed by any other pull requests, but I couldn't find them.

@KingsleyKelly KingsleyKelly force-pushed the force branch 2 times, most recently from 044e092 to 5504ef4 Compare February 23, 2015 22:32
@albers
Copy link

albers commented Feb 24, 2015

Please give me a ping if this is accepted so that I can add the flag to bash completion.

Copy link

Choose a reason for hiding this comment

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

Is this necessary? I believe docopt normalises -f to --force.

Copy link
Author

Choose a reason for hiding this comment

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

You are entirely right. I seem to have fixed a bug that was fixed! Sorry, I also tested this against my current version of fig where the flag failed and thought the above had fixed it. I can close this pull request if that makes the most sense.

Copy link

Choose a reason for hiding this comment

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

No need. You can make a change while keeping it to one commit with git commit --amend, and then push that to your branch with git push --force.

Copy link

Choose a reason for hiding this comment

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

To be clear: it's your change to the docs for rm that causes -f to work as a short version of --force. That's how docopt works - you write the docs and it implements the flags.

But we don't need the check for options.get('-f') because docopt is smart and just sets options['--force'] if it sees -f. So this line can be reverted.

Copy link
Author

Choose a reason for hiding this comment

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

Ok that's awesome. Have amended the commit.

@aanand
Copy link

aanand commented Feb 26, 2015

LGTM

@dnephin
Copy link

dnephin commented Feb 26, 2015

LGTM, but it seems like the wercker build hasn't run against this PR for some reason?

Signed-off-by: Kingsley Kelly <kingsley.kelly@gmail.com>
@KingsleyKelly
Copy link
Author

I tried amending the commit and opening a new pull request, neither of which triggered wercker. I'm unfamiliar with the service, is this likely to be an error on my end?

@dnephin
Copy link

dnephin commented Feb 28, 2015

Nope, I don't think it's on your end. I know @aanand is working on having the test suite run on jenkins, I'm not sure if wercker integration was disabled, or if there is an error on their end.

@aanand
Copy link

aanand commented Mar 2, 2015

Looks like Wercker is still running but we've lost the indicator, possibly because I added hooks for Jenkins and it's confusing GitHub about what to show.

The build was successful, so I'm going to merge.

aanand added a commit that referenced this pull request Mar 2, 2015
Add -f flag as option on rm.
@aanand aanand merged commit f89f9e3 into docker:master Mar 2, 2015
@bfirsh bfirsh added this to the 1.2.0 milestone Mar 2, 2015
yuval-k pushed a commit to yuval-k/compose that referenced this pull request Apr 10, 2015
Add -f flag as option on rm.
Signed-off-by: Yuval Kohavi <yuval.kohavi@gmail.com>
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.

Proposal: fig rm -f shortcut for fig rm --force

5 participants