git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Andreas Heiduk <andreas.heiduk@mathema.de>
To: Git Mailing List <git@vger.kernel.org>
Subject: Bug^Feature? fetch protects only current working tree branch
Date: Sun, 23 Jul 2017 16:50:54 +0200	[thread overview]
Message-ID: <cb957174-5e9a-5603-ea9e-ac9b58a2eaad@mathema.de> (raw)

A `git fetch . origin/master:master` protects the currently checked out 
branch (HEAD) unless the `-u/--update-head-ok` is supplied. This avoids a
mismatch between the index and HEAD. BUT branches which are HEADs in other
working trees do not get that care - their state is silently screwed up.

Is this intended behaviour or and just an oversight while implementing
`git worktree`?


Steps to reproduce

    # setup

    git clone -b master $SOMETHING xtemp
    cd xtemp
    git reset --hard HEAD~5 # pretend to be back some time
    git worktree add ../xtemp-wt1
    git worktree add ../xtemp-wt2

    # test

    git fetch . origin/master:master
    
        fatal: Refusing to fetch into current branch refs/heads/master  of non-bare repository
        fatal: The remote end hung up unexpectedly

    # OK, current working tree is protected, try another one:

    git fetch . origin/master:xtemp-wt1

        From .
           b4d1278..6e7b60d  origin/master -> xtemp-wt1

    cd ../xtemp-wt1
    git status

        # admire messed up working tree here

    # The protection is really "current working tree", not "first/main working tree"!

    git fetch . origin/master:master

        From .
           b4d1278..6e7b60d  origin/master -> master

    cd ../xtemp
    git status

        # now it's messed up here too

    # Try with "--update-head-ok" but check first.

    cd ../xtemp-wt2

    git fetch . origin/master:xtemp-wt2

        fatal: Refusing to fetch into current branch refs/heads/xtemp-wt2 of non-bare repository
        fatal: The remote end hung up unexpectedly

    git fetch --update-head-ok . origin/master:xtemp-wt2
        
        From .
           b4d1278..6e7b60d  origin/master -> xtemp-wt2



             reply	other threads:[~2017-07-23 14:59 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-07-23 14:50 Andreas Heiduk [this message]
2017-07-23 22:13 ` Bug^Feature? fetch protects only current working tree branch Junio C Hamano
2017-07-24 21:51   ` Andreas Heiduk

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

  List information: http://vger.kernel.org/majordomo-info.html

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

  git send-email \
    --in-reply-to=cb957174-5e9a-5603-ea9e-ac9b58a2eaad@mathema.de \
    --to=andreas.heiduk@mathema.de \
    --cc=git@vger.kernel.org \
    /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.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).