[Lldb-commits] [PATCH] D61440: C.128 override, virtual keyword handling

Konrad Wilhelm Kleine via Phabricator via lldb-commits lldb-commits at lists.llvm.org
Thu May 2 13:31:09 PDT 2019

kwk added a comment.

In D61440#1488470 <https://reviews.llvm.org/D61440#1488470>, @teemperor wrote:

> Not sure how you invoke git clang-format, but I assume you specified the wrong commit range...

That is correct in this case I've used clang format directly on the whole file. Sorry if that was a noob mistake.

> I personally use some custom command that executes this `git rebase -i --autosquash -x 'git clang-format master && git commit -a --amend --no-edit' master` which essentially clang-formats all your git commits (i.e. the ones that are in the local branch but not in master). So if you have the original version of this diff as its own git commit on a separate branch then this command should do all the work for you.

Thank you for that tip. Unfortunately I've started not on a branch and when I create it now things become complicated. I'm not famiiar enough with the `arc` tool and will do some reading before just calling `arc diff` next time. Because when I do that now after rebasing, `arc` tries to upload a commit that is no longer in my history.

How do you handle rebasing or squashing here? When I run your special command from above, it will rewrite the git history which to me is a no go when I send my code to review. If all these reviews are going to happen on Github anytime, then you would embrace having an append-only history.

  rG LLVM Github Monorepo



More information about the lldb-commits mailing list