Prefer `--force-with-lease` over `--force` #363

calleluks · 2015-10-16T09:26:59Z

Using --force-with-lease allows one to force push without the risk of
unintentionally overwriting someone else's work.

The git-push(1) man page states:

Usually, "git push" refuses to update a remote ref that is not an
ancestor of the local ref used to overwrite it.

This option overrides this restriction if the current value of the
remote ref is the expected value. "git push" fails otherwise.

--force-with-lease alone, without specifying the details, will protect
all remote refs that are going to be updated by requiring their
current value to be the same as the remote-tracking branch we have for
them.

mike-burns · 2015-10-16T09:28:20Z

Yes!

teoljungberg · 2015-10-16T09:28:34Z

I love --force-with-lease, and it fits nicely into our rebase workflow.

<sidebar> I've intended to write a blogpost about it for months. Maybe one day. </sidebar>

seanpdoyle · 2015-10-16T11:53:23Z

This sounds great, but it's very verbose.

Is there an abbreviation? Is there any way to override the -f flag to do this instead?

teoljungberg · 2015-10-16T11:58:09Z

There is no abbreviation according to the man page

mike-burns · 2015-10-16T12:00:08Z

Nor could I find one in the codebase.

mike-burns · 2015-10-16T12:01:11Z

If it's too verbose, may I recommend:

[alias]
  pf = push --force-with-lease

seanpdoyle · 2015-10-16T12:11:57Z

@mike-burns is that's the case, should/could there be a matching PR to the dotfiles once if this is merged?

mike-burns · 2015-10-16T12:58:19Z

@seanpdoyle no complaints from me!

@calleerlandsson

Using `--force-with-lease` allows one to force push without the risk of unintentionally overwriting someone else's work. The git-push(1) man page states: > Usually, "git push" refuses to update a remote ref that is not an > ancestor of the local ref used to overwrite it. > > This option overrides this restriction if the current value of the > remote ref is the expected value. "git push" fails otherwise. > > --force-with-lease alone, without specifying the details, will protect > all remote refs that are going to be updated by requiring their > current value to be the same as the remote-tracking branch we have for > them. > > --@calleerlandsson > -- thoughtbot/guides#363

seanpdoyle · 2015-10-16T13:13:33Z

@mike-burns thoughtbot/dotfiles#431

@calleerlandsson

Using `--force-with-lease` allows one to force push without the risk of unintentionally overwriting someone else's work. The git-push(1) man page states: > Usually, "git push" refuses to update a remote ref that is not an > ancestor of the local ref used to overwrite it. > > This option overrides this restriction if the current value of the > remote ref is the expected value. "git push" fails otherwise. > > --force-with-lease alone, without specifying the details, will protect > all remote refs that are going to be updated by requiring their > current value to be the same as the remote-tracking branch we have for > them. > > --@calleerlandsson > -- thoughtbot/guides#363

> `--force-with-lease` alone, without specifying the details, will protect all > remote refs that are going to be updated by requiring their current value to > be the same as the remote-tracking branch we have for them. thoughtbot/guides#363

calleluks · 2015-10-26T08:45:21Z

I'll merge this.

Using `--force-with-lease` allows one to force push without the risk of unintentionally overwriting someone else's work. The git-push(1) man page states: > Usually, "git push" refuses to update a remote ref that is not an > ancestor of the local ref used to overwrite it. > > This option overrides this restriction if the current value of the > remote ref is the expected value. "git push" fails otherwise. > > --force-with-lease alone, without specifying the details, will protect > all remote refs that are going to be updated by requiring their > current value to be the same as the remote-tracking branch we have for > them.

@calleerlandsson

Using `--force-with-lease` allows one to force push without the risk of unintentionally overwriting someone else's work. The git-push(1) man page states: > Usually, "git push" refuses to update a remote ref that is not an > ancestor of the local ref used to overwrite it. > > This option overrides this restriction if the current value of the > remote ref is the expected value. "git push" fails otherwise. > > --force-with-lease alone, without specifying the details, will protect > all remote refs that are going to be updated by requiring their > current value to be the same as the remote-tracking branch we have for > them. > > --@calleerlandsson > -- thoughtbot/guides#363

@calleerlandsson

Using `--force-with-lease` allows one to force push without the risk of unintentionally overwriting someone else's work. The git-push(1) man page states: > Usually, "git push" refuses to update a remote ref that is not an > ancestor of the local ref used to overwrite it. > > This option overrides this restriction if the current value of the > remote ref is the expected value. "git push" fails otherwise. > > --force-with-lease alone, without specifying the details, will protect > all remote refs that are going to be updated by requiring their > current value to be the same as the remote-tracking branch we have for > them. > > --@calleerlandsson > -- thoughtbot/guides#363

@calleerlandsson

Using `--force-with-lease` allows one to force push without the risk of unintentionally overwriting someone else's work. The git-push(1) man page states: > Usually, "git push" refuses to update a remote ref that is not an > ancestor of the local ref used to overwrite it. > > This option overrides this restriction if the current value of the > remote ref is the expected value. "git push" fails otherwise. > > --force-with-lease alone, without specifying the details, will protect > all remote refs that are going to be updated by requiring their > current value to be the same as the remote-tracking branch we have for > them. > > --@calleerlandsson > -- thoughtbot/guides#363

@calleerlandsson

Using `--force-with-lease` allows one to force push without the risk of unintentionally overwriting someone else's work. The git-push(1) man page states: > Usually, "git push" refuses to update a remote ref that is not an > ancestor of the local ref used to overwrite it. > > This option overrides this restriction if the current value of the > remote ref is the expected value. "git push" fails otherwise. > > --force-with-lease alone, without specifying the details, will protect > all remote refs that are going to be updated by requiring their > current value to be the same as the remote-tracking branch we have for > them. > > --@calleerlandsson > -- thoughtbot/guides#363

@calleerlandsson

Using `--force-with-lease` allows one to force push without the risk of unintentionally overwriting someone else's work. The git-push(1) man page states: > Usually, "git push" refuses to update a remote ref that is not an > ancestor of the local ref used to overwrite it. > > This option overrides this restriction if the current value of the > remote ref is the expected value. "git push" fails otherwise. > > --force-with-lease alone, without specifying the details, will protect > all remote refs that are going to be updated by requiring their > current value to be the same as the remote-tracking branch we have for > them. > > --@calleerlandsson > -- thoughtbot/guides#363

@calleerlandsson

Using `--force-with-lease` allows one to force push without the risk of unintentionally overwriting someone else's work. The git-push(1) man page states: > Usually, "git push" refuses to update a remote ref that is not an > ancestor of the local ref used to overwrite it. > > This option overrides this restriction if the current value of the > remote ref is the expected value. "git push" fails otherwise. > > --force-with-lease alone, without specifying the details, will protect > all remote refs that are going to be updated by requiring their > current value to be the same as the remote-tracking branch we have for > them. > > --@calleerlandsson > -- thoughtbot/guides#363

@calleerlandsson

Using `--force-with-lease` allows one to force push without the risk of unintentionally overwriting someone else's work. The git-push(1) man page states: > Usually, "git push" refuses to update a remote ref that is not an > ancestor of the local ref used to overwrite it. > > This option overrides this restriction if the current value of the > remote ref is the expected value. "git push" fails otherwise. > > --force-with-lease alone, without specifying the details, will protect > all remote refs that are going to be updated by requiring their > current value to be the same as the remote-tracking branch we have for > them. > > --@calleerlandsson > -- thoughtbot/guides#363

@calleerlandsson

Using `--force-with-lease` allows one to force push without the risk of unintentionally overwriting someone else's work. The git-push(1) man page states: > Usually, "git push" refuses to update a remote ref that is not an > ancestor of the local ref used to overwrite it. > > This option overrides this restriction if the current value of the > remote ref is the expected value. "git push" fails otherwise. > > --force-with-lease alone, without specifying the details, will protect > all remote refs that are going to be updated by requiring their > current value to be the same as the remote-tracking branch we have for > them. > > --@calleerlandsson > -- thoughtbot/guides#363

@calleerlandsson

Using `--force-with-lease` allows one to force push without the risk of unintentionally overwriting someone else's work. The git-push(1) man page states: > Usually, "git push" refuses to update a remote ref that is not an > ancestor of the local ref used to overwrite it. > > This option overrides this restriction if the current value of the > remote ref is the expected value. "git push" fails otherwise. > > --force-with-lease alone, without specifying the details, will protect > all remote refs that are going to be updated by requiring their > current value to be the same as the remote-tracking branch we have for > them. > > --@calleerlandsson > -- thoughtbot/guides#363

ghost · 2017-07-22T16:04:09Z

@teoljungberg wrote:

I've intended to write a blogpost about it for months. Maybe one day.

Looks like one of your colleagues has done this for you :)

Using `--force-with-lease` allows one to force push without the risk of unintentionally overwriting someone else's work. The git-push(1) man page states: Usually, "git push" refuses to update a remote ref that is not an ancestor of the local ref used to overwrite it. This option overrides this restriction if the current value of the remote ref is the expected value. "git push" fails otherwise. Imagine that you have to rebase what you have already published. You will have to bypass the "must fast-forward" rule in order to replace the history you originally published with the rebased history. If somebody else built on top of your original history while you are rebasing, the tip of the branch at the remote may advance with her commit, and blindly pushing with --force will lose her work. This option allows you to say that you expect the history you are updating is what you rebased and want to replace. If the remote ref still points at the commit you specified, you can be sure that no other people did anything to the ref. It is like taking a "lease" on the ref without explicitly locking it, and the remote ref is updated only if the "lease" is still valid. References: - https://developer.atlassian.com/blog/2015/04/force-with-lease/ - thoughtbot/guides#363

seanpdoyle mentioned this pull request Oct 16, 2015

Add git pf alias thoughtbot/dotfiles#431

Closed

calleluks force-pushed the lease branch from 086b8c1 to 150d2d6 Compare October 26, 2015 08:45

calleluks merged commit 150d2d6 into master Oct 26, 2015

calleluks deleted the lease branch October 26, 2015 08:46

bbrandt mentioned this pull request Jun 8, 2018

recommend --force-with-lease when rebasing saltstack/salt#48028

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Prefer `--force-with-lease` over `--force` #363

Prefer `--force-with-lease` over `--force` #363

calleluks commented Oct 16, 2015

mike-burns commented Oct 16, 2015

teoljungberg commented Oct 16, 2015

seanpdoyle commented Oct 16, 2015

teoljungberg commented Oct 16, 2015

mike-burns commented Oct 16, 2015

mike-burns commented Oct 16, 2015

seanpdoyle commented Oct 16, 2015

mike-burns commented Oct 16, 2015

seanpdoyle commented Oct 16, 2015

calleluks commented Oct 26, 2015

ghost commented Jul 22, 2017

Prefer --force-with-lease over --force #363

Prefer --force-with-lease over --force #363

Conversation

calleluks commented Oct 16, 2015

mike-burns commented Oct 16, 2015

teoljungberg commented Oct 16, 2015

seanpdoyle commented Oct 16, 2015

teoljungberg commented Oct 16, 2015

mike-burns commented Oct 16, 2015

mike-burns commented Oct 16, 2015

seanpdoyle commented Oct 16, 2015

mike-burns commented Oct 16, 2015

seanpdoyle commented Oct 16, 2015

calleluks commented Oct 26, 2015

ghost commented Jul 22, 2017

Prefer `--force-with-lease` over `--force` #363

Prefer `--force-with-lease` over `--force` #363