On Fri, Jul 17, 2015 at 8:49 AM, Duy Nguyen <pclouds@xxxxxxxxx> wrote: > On Fri, Jul 17, 2015 at 7:27 PM, Michael J Gruber > <git@xxxxxxxxxxxxxxxxxxxx> wrote: >> Two more observations: >> >> $ git worktree add /tmp/gitwt >> Enter /tmp/gitwt (identifier gitwt) >> Switched to a new branch 'gitwt' >> >> Now I'm in /tmp/gitwt at branch gitwt. Right? No. I'm in the original wd >> at the original branch. >> >> So either we cd to the new location or quelch these messages or add a >> message that we're actually back. > > s/Enter/Preparing/ ? Presumably you're using 'master'. The "Switched to a new branch" message is an artifact of using git-checkout for the back-end operation, however, what is queued in 'pu' no long uses git-checkout at all, so that message is gone. I agree with Duy that s/Enter/Prepare/ would be a good idea. I don't think we want to drop the message altogether as Junio suggested since other messages such as "Checking out files:..." and "HEAD is now at...." follow it, thus "Prepare..." provides context indicating that those additional messages apply to the new worktree rather than the current one. >> The other: >> >> linked worktrees are prefect for short term tests on detached heads. >> Even the manual page advertises detach. But: >> >> $ git worktree add --detach /tmp/gitwtt >> Enter /tmp/gitwtt (identifier gitwtt) >> fatal: '--detach' cannot be used with '-b/-B/--orphan' >> >> Maybe it's the auto-naming logic stepping on detached toes ;) > > Problem with master (but not with pu) because "-b gitwtt" is > automatically added. I think this is 1eb07d8 (worktree: add: > auto-vivify new branch when <branch> is omitted - 2015-07-06) > forgetting about --detach. Actually it's still a problem with 'pu' > because the branch 'gitwtt' is created unnecessarily. Yep. Again, that fatal error is an artifact from git-checkout being used as the back-end on 'master'. What is queued on 'pu' doesn't fail, however, as Duy notes, the auto-vivication incorrectly kicks in and creates a new branch unnecessarily. That'll have to be fixed in v3. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html