Paul C. Anagnostopoulos via llvm-dev
2020-Dec-28 19:29 UTC
[llvm-dev] Question about state of the repository
Hmm. Thanks for sticking with me here. I believe origin/HEAD already points to main.>git remote show origin* remote origin Fetch URL: https://github.com/llvm/llvm-project.git Push URL: https://github.com/llvm/llvm-project.git HEAD branch: main Or do I misunderstand that display? At 12/28/2020 01:41 PM, Mehdi AMINI wrote:>On Mon, Dec 28, 2020 at 10:30 AM Paul C. Anagnostopoulos <<mailto:paul at windfall.com>paul at windfall.com> wrote: >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? > >origin/HEAD is set locally to the default remote branch at the time you clone the repo. In a fresh clone it'll point to origin/main. >You can change it with:Â git remote set-head origin main
Mehdi AMINI via llvm-dev
2020-Dec-28 19:36 UTC
[llvm-dev] Question about state of the repository
On Mon, Dec 28, 2020 at 11:30 AM Paul C. Anagnostopoulos <paul at windfall.com> wrote:> Hmm. Thanks for sticking with me here. I believe origin/HEAD already > points to main. > > >git remote show origin > * remote origin > Fetch URL: https://github.com/llvm/llvm-project.git > Push URL: https://github.com/llvm/llvm-project.git > HEAD branch: main > > Or do I misunderstand that display? >This is querying the remote to get the current remote state, i.e. what is set when you clone. This does not show the local state, you can try: *cat .git/refs/remotes/origin/HEAD* Then run *git remote set-head origin main* and check again. You can also run *git remote set-head origin -a* instead, it'll query the remote the same way as you see with *git remote show origin* and set it to main as well. -- Mehdi> > At 12/28/2020 01:41 PM, Mehdi AMINI wrote: > >On Mon, Dec 28, 2020 at 10:30 AM Paul C. Anagnostopoulos <<mailto: > paul at windfall.com>paul at windfall.com> wrote: > >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? > > > >origin/HEAD is set locally to the default remote branch at the time you > clone the repo. In a fresh clone it'll point to origin/main. > >You can change it with: git remote set-head origin main > >-------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.llvm.org/pipermail/llvm-dev/attachments/20201228/46cf10ce/attachment.html>