[PATCH] D67262: [git-llvm] Do not reinvent `@{upstream}`

Tue Sep 10 00:38:27 PDT 2019

davezarzycki added a comment.

In D67262#1664146 <https://reviews.llvm.org/D67262#1664146>, @mehdi_amini wrote:

> I took the responsibility of reverting in r371480, since I approved this revision without anticipating the behavior change.
>
> > To add some more words, previously we could `git checkout -b foo`, hack a bit commit, and run this script. Now this requires additional, long flags. I don't think making a corner case work that nobody noticed being broken for many months is worth making everything more inconvenient for everyone.
>
> This is a very good point. How do we move forward though?
>  With the migration to GitHub around the corner, I think it'll be important to have `git llvm` behaves as much as possible as thin wrapper on top of `git` (in case you don't know `git llvm push` will be mandatory to push to LLVM on GitHub, as far as I know).

I think it really depends on what the community wants. Is git-llvm a transitional tool? Or do people want to keep using it long after the transition?

Personally, I hope that git-llvm can go away after the transition, so deprecating deviations from normal git behavior is preferable (like the assumption that the remote is named "origin"). That being said, there seems to be some desire in the community to use git-llvm as a way to workaround GitHub quirks (like the lack of pre-receive hooks to enforce community norms like "no merge commits").

In any case, we can certainly fall back to "origin/master" if "upstream <https://reviews.llvm.org/diviner/find/?name=upstream&type=null&jump=1>" fails and warn about this behavior being different from git proper.

Dave

PS – Hi @thakis. I think it is unfair and incorrect to say that "nobody noticed" that the existing behavior was problematic. I noticed. And I'd wager others did also. That being said, the kinds of people that would notice that "origin" is hardcoded into git-llvm also tend to be the kinds of people that can workaround this git-llvm bug until they get tired of doing so and submit a patch.

Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D67262/new/

https://reviews.llvm.org/D67262