From: Eric James Michael Ritz <Eric@cybersprocket•com>
To: Thomas Rast <trast@student•ethz.ch>
Cc: git@vger•kernel.org
Subject: Re: Replacing a Remote Branch
Date: Fri, 23 Jul 2010 16:52:42 -0400 [thread overview]
Message-ID: <4C4A011A.40604@cybersprocket.com> (raw)
In-Reply-To: <201007232248.49520.trast@student.ethz.ch>
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
On 07/23/2010 04:48 PM, Thomas Rast wrote:
> Eric James Michael Ritz wrote:
>> 2. I realized I need to perform some ‘destructive’ action like
>> ‘rebase -i’ or amend the last commit to fix a typo in the message.
>>
>> 3. Then I want to push the changed branch as a replacement.
> [...]
>> $ git push origin :foo && git push origin foo
>>
>> to replace `foo`. But is there a shorter way to do this? I thought
>> that writing something like
>>
>> $ git push origin +foo:foo
>>
>> may have the intended effect, but I still get a rejection due to a
>> non-fast-forward, so I am likely misunderstanding the purpose of `+`.
>
> Since + overrides the non-ff check, this means that the remote side
> has receive.denyNonFastForwards (see man git-config) enabled (or a
> hook to the same effect). Deleting and pushing the new branch merely
> defeats this refusal because it is no longer a branch *update*.
>
> You should probably check why and by who receive.denyNonFastForwards
> was set. Git itself sets it if you use 'git init --shared', so that
> may be one reason.
That’s the reason then, `--shared` was used.
> Note that non-ff updates are generally a bad thing for everyone who
> has work based on the affected branch.
We make it a policy to never base work off individual developer’s
branches precisely for this reason, because we’re often making
cleanups via rebase and such.
Thank you for the answer.
- --
Eric James Michael Ritz
Cyber Sprocket Labs
(843) 225-3830
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/
iQEcBAEBAgAGBQJMSgEVAAoJEEHUZXw5hMWsu1wIANwTnswKzd0pKub3zms1y2wv
ouv2TRvxvpQhKvVO2r+CjDohdH2BQQIa2FWa8g/bG7fQVvGby1xQkWNJYxypebrh
GHHX3Q4uF6mNIqD+yC4AQNQdEywCDXL4lBqh0Q7Bo+6ZGhUtQIEp1vyWHQeHTLuZ
8NhWd4PwE4z5ssGGKTzzvg2FgkWxtKrNaCVXfPTHpeh51J/Slt0Jfhw/i/zXNlGU
BN0Jlnavhvr5IDbODCNB96KJQue1xLZv+mNNrINlY+TlHwNVyKlq2ui8zvG0vC0K
OwwbOh6HlGV1sPReFfbObu6F9oxz6DMcmdHqNtedQPiAmm38EIuFFTa4H1CiYlM=
=P2Zr
-----END PGP SIGNATURE-----
next prev parent reply other threads:[~2010-07-23 22:05 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-23 20:14 Replacing a Remote Branch Eric James Michael Ritz
2010-07-23 20:48 ` Thomas Rast
2010-07-23 20:52 ` Eric James Michael Ritz [this message]
2010-07-24 1:17 ` bill lam
2010-07-24 16:03 ` [PATCH 1/2] Document receive.denyDeleteCurrent Thomas Rast
2010-07-24 16:03 ` [PATCH 2/2] Documentation/git-push: Explain status output in more detail Thomas Rast
2010-07-24 16:07 ` [PATCH v1.1 1/2] Document receive.denyDeleteCurrent Thomas Rast
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=4C4A011A.40604@cybersprocket.com \
--to=eric@cybersprocket$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=trast@student$(echo .)ethz.ch \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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