All of lore.kernel.org
 help / color / mirror / Atom feed
From: "SZEDER Gábor" <szeder.dev@gmail.com>
To: Jeffrey Walton <noloader@gmail.com>
Cc: Git List <git@vger.kernel.org>
Subject: Re: Why am I on Master instead of my branch
Date: Sun, 15 Mar 2020 11:52:53 +0100	[thread overview]
Message-ID: <20200315105253.GI3122@szeder.dev> (raw)
In-Reply-To: <CAH8yC8=FZrDmHBSk=GFZd08Ovk4zffyB7KEOoyUpAPLYi_xUeA@mail.gmail.com>

On Sat, Mar 14, 2020 at 09:54:00PM -0400, Jeffrey Walton wrote:
> I'm trying to test some changes I made on a branch on some other
> machines. The changes were committed and pushed. However, after a
> checkout and pull on the other machines the changes were missing.
> 
> When I do a 'git branch' I am on master for some reason:
> 
> $ git branch
>   cmake-inno-setup-COVERAGE
>   config-guess
>   declarations
> * master
> 
> However, I have never switched back to master:

Perhaps you haven't switched away from 'master' in the first place.

> $ history | grep git | grep -E 'master|cmake'
> ...
> 2630  git checkout cmake-inno-setup-COVERAGE

This could have failed because the branch 'cmake-inno-setup-COVERAGE'
didn't exist.

>  2631  git fetch upstream cmake-inno-setup-COVERAGE

This fetched the branch 'cmake-inno-setup-COVERAGE' that exists on the
remote and stored the commit object id at its tip in FETCH_HEAD, but
it didn't create a local branch of the same name.

>  2632  git checkout cmake-inno-setup-COVERAGE
>  2634  git checkout cmake-inno-setup-COVERAGE

So these two failed as well, because there was no such branch.

>  2635  git branch cmake-inno-setup-COVERAGE

Here you do create a branch called 'cmake-inno-setup-COVERAGE'
(pointing to the currently checked out commit in your local
repository, which is most likely not where it points to in the remote
repo), but you haven't checked it out.

>  2757  git diff upstream/master
>  2766  history | grep git | grep -E 'master|cmake'
> <end of history>
> 
> How am I on master when I checked out cmake-inno-setup-COVERAGE?

Did you?
We can't tell without you telling us what the output of all those
commands were.


      parent reply	other threads:[~2020-03-15 10:53 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-03-15  1:54 Why am I on Master instead of my branch Jeffrey Walton
2020-03-15  9:45 ` Andreas Schwab
2020-03-15 10:52 ` SZEDER Gábor [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200315105253.GI3122@szeder.dev \
    --to=szeder.dev@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=noloader@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.