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

[Nico Weber via Phabricator via llvm-commits]

thakis added a comment.

> 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.

I don't think fairness is the most productive axis to focus on here.

I tried to land a change yesterday. I've done this successfully many times. I've used git for years and I don't know any of these upstream commands, so I'd contest "Working with and configuring upstream branches is fundamental to using git.".

Nevertheless, I tried to read docs on it, yet couldn't really get anywhere after 15 minutes, when I kind of gave up.

My takeaway for now is that I need to run `git branch --set-upstream-to=origin/master` after I run `git checkout -b hack` every time.  This is very long to type, hard to memorize, and I lost 20+ minutes due to this change so far. I'm guessing most people aren't on the monorepo yet, but if 25% of people on the monorepo have similar problems to me then this change is causing many hours of lost engineering time for the llvm community.

Maybe the `--track` flag can save me some typing, but I couldn't figure out how to hold it correctly.

Maybe we could restore the previous behavior if no upstream is set on the current branch? That would likely make your use case work without breaking (at least) @leonardchan's and mine?


Repository:
  rG LLVM Github Monorepo

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

https://reviews.llvm.org/D67262