Mehdi AMINI via llvm-dev
2020-Dec-28 17:52 UTC
[llvm-dev] Question about state of the repository
On Mon, Dec 28, 2020 at 9:47 AM Paul C. Anagnostopoulos <paul at windfall.com> wrote:> Oh, sorry, my original message was wrong. The 'git log origin...' showed > only the first commit, the one I wanted to push. It was a 'git log > --oneline 10' that showed this: > > 48dfad4d2e7b (HEAD -> main, bang) [TableGen] Fix bug in !interleave > operator > 496fb70b141c (origin/main) [MachO] Fix enum-int mismatch warning > e73f885c988d (origin/master, origin/HEAD) [PowerPC] Remove redundant > COPY_TO_REGCLASS introduced by 8a58f21f5b6c > c3b9d85bd4b7 [clang-tidy][NFC] Remove unnecessary headers > ... > > What I don't understand is the "origin/master, origin/HEAD' part. What is > going on there? >These in parenthesis are indicating the head of each branch, local or remote.> > At 12/28/2020 12:33 PM, Mehdi AMINI wrote: > > > >On Mon, Dec 28, 2020 at 9:11 AM Paul C. Anagnostopoulos via llvm-dev > <<mailto:llvm-dev at lists.llvm.org>llvm-dev at lists.llvm.org> wrote: > >I was about to push a revision and did my customary > > > >> git log origin/main...HEAD --oneline > > > >Here is what it displayed: > > > >48dfad4d2e7b (HEAD -> main, bang) [TableGen] Fix bug in !interleave > operator > >496fb70b141c (origin/main) [MachO] Fix enum-int mismatch warning > >e73f885c988d (origin/master, origin/HEAD) [PowerPC] Remove redundant > >  COPY_TO_REGCLASS introduced by 8a58f21f5b6c > >c3b9d85bd4b7 [clang-tidy][NFC] Remove unnecessary headers > > > >What is going on with the third commit? > > > > > >The `...` you're using in `git log` shows you the difference between your > local branch and the remote. So all these commits are the ones that are in > either but not both. > >If you just want to see your local change not in the remote branch, you > need to use online two dots: git log origin/main..HEAD --oneline > >This last syntax is equivalent to git log ^origin/main HEAD --oneline > >And HEAD is also implicit so you can write: > >git log origin/main.. --oneline > >or: git log ^origin/main --oneline > > > >-- > >Mehdi > >-------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.llvm.org/pipermail/llvm-dev/attachments/20201228/09fe7c60/attachment.html>
Paul C. Anagnostopoulos via llvm-dev
2020-Dec-28 18:25 UTC
[llvm-dev] Question about state of the repository
At 12/28/2020 12:52 PM, Mehdi AMINI wrote:>On Mon, Dec 28, 2020 at 9:47 AM Paul C. Anagnostopoulos <<mailto:paul at windfall.com>paul at windfall.com> wrote: >Oh, sorry, my original message was wrong. The 'git log origin...' showed only the first commit, the one I wanted to push. It was a 'git log --oneline 10' that showed this: > >48dfad4d2e7b (HEAD -> main, bang) [TableGen] Fix bug in !interleave operator >496fb70b141c (origin/main) [MachO] Fix enum-int mismatch warning >e73f885c988d (origin/master, origin/HEAD) [PowerPC] Remove redundant >Â Â COPY_TO_REGCLASS introduced by 8a58f21f5b6c >c3b9d85bd4b7 [clang-tidy][NFC] Remove unnecessary headers >... > >What I don't understand is the "origin/master, origin/HEAD' part. What is going on there? > >These in parenthesis are indicating the head of each branch, local or remote.Yes, but why doesn't origin/HEAD point to the same commit as origin/main?