Re: Git enable force push for master branches
Am 9. November 2019 15:28:30 MEZ schrieb Vladimir Sitnikov : >Up. Any thoughts? > >This could have been prevented if force-push was enabled: >https://github.com/apache/jmeter/commit/04aab12c68af8c57258c5ae905bd8b7ab0a2dd9f I still think that it is better to have such commits in the history, than to not know if it is the true history. So again. I am against enabling force push on master. Felix > >Vladimir
Re: Git enable force push for master branches
Up. Any thoughts? This could have been prevented if force-push was enabled: https://github.com/apache/jmeter/commit/04aab12c68af8c57258c5ae905bd8b7ab0a2dd9f Vladimir
Re: Git enable force push for master branches
>It is a luxury we can live without. Do you really suggest to revert JUnit4->JUnit5 change and redo it? Have you tried that? The source history would look insane as it shows that "the revert" commit was the latest commit touching the test codebase. 1) Maintaining a pull request **often** requires multiple force-push operations before the PR can be merged. For instance, Graham used force-push 4 times during JUnit5->JUnit4 development: https://github.com/apache/jmeter/pull/524 force-push enabled Graham to preview how the changes land on top of the current master, and it was possible to have a clean history. PS. I don't like that the commits were squashed into a single one on merge. Basically there were at least 2 distinct types of changes: mechanical (package renames) and meaningful (conversion of non-trivial classes) In other words, rebase+force-push enabled Graham to see the changes as if the changes were originally developed on top of a bleeding-edge source. 2) Here I configure Appveyor: https://github.com/apache/jmeter/pull/529 Even though it is a single-file change, I force-push a lot so the final commit looks sane. 3) You do not have to use force-push when pushing code to the master branch. On top of that, even if force-push is allowed, it is **not** something Git would use by default. The default mode is **not** force. 4) One can easily mess Git history even without force-push operations. One can push regular commits that contain half-baked code. 5) Of course, the one who uses force-push can mess the history. However, 5.1) Trivial recovery is always possible. ASF sends commit ids "before and after", so the force push can **easily** be reverted. 5.2) Even if ASF misses the mail (which it must not), there are lots of forks to recover from. At least there's one at the development machine which was used to initiate the force-push. 5.3) In 99.99% the recovery won't be required provided force-push was "sane" Vladimir
Re: Git enable force push for master branches
Hello, Maybe I am wrong in my understanding of what you want to do. But if that is what it is about: - https://blog.developer.atlassian.com/force-with-lease/ - https://stackoverflow.com/a/43567591 - https://stackoverflow.com/a/18505634 I am personally not confortable with enabling force push. It is a luxury we can live without. If my understanding is wrong, please clarify. Regards On Mon, Oct 7, 2019 at 9:54 AM Vladimir Sitnikov < sitnikov.vladi...@gmail.com> wrote: > Updated subject from "Git status update" > > The discussion "what if we enable force push" reminds me the discussion on > "should we move files when migrating to Gradle". > > There was a plenty of comments like "please try to keep old file layout", > however it turns like file layout is not really an issue. > > The same pattern repeats here with "let's enable force push". > I suggest we agree to enable it, and see how it goes. > > This does not harm, and we all save time on trying to invent theoretical > cases. > > Just in case: Apache Calcite is used to have force pushes for ages. > Force-push is used there for the same reasons (fix typos in commits, revert > commits, etc), and there are no issues/complains. > > Vladimir > -- Cordialement. Philippe Mouawad.
Re: Git enable force push for master branches
Updated subject from "Git status update" The discussion "what if we enable force push" reminds me the discussion on "should we move files when migrating to Gradle". There was a plenty of comments like "please try to keep old file layout", however it turns like file layout is not really an issue. The same pattern repeats here with "let's enable force push". I suggest we agree to enable it, and see how it goes. This does not harm, and we all save time on trying to invent theoretical cases. Just in case: Apache Calcite is used to have force pushes for ages. Force-push is used there for the same reasons (fix typos in commits, revert commits, etc), and there are no issues/complains. Vladimir
