Re: [PATCH] worktree: allow "-" short-hand for @{-1} in add command

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Matthieu Moy <Matthieu.Moy@xxxxxxxxxxxxxxx> writes:

> Junio C Hamano <gitster@xxxxxxxxx> writes:
>
>> Jordan DE GEA <jordan.de-gea@xxxxxxxxxxxxxxxx> writes:
>>
>>> +	branch=$(cd short-hand && git rev-parse --symbolic-full-name HEAD) &&
>>> +	test "$branch" = refs/heads/newbranch &&
>>> +	cd ..
>>
>> If any of the command between "cd short-hand" and "cd .." failed,
>> after correcting the broken &&-chain, the next test will end up
>> running in short-hand directory, which it is not expecting.  A
>> canonical way to avoid this problem is to replace the above with:
>>
>> 	...
>>         git worktree add short-hand - &&
>>         (
>> 		cd short-hand &&
>>                 ...
>>                 test "$branch" = refs/heads/newbranch
>> 	)
>
> Actually, $(...) implicitly does a subshell, so the "cd .." was just
> useless.

You trimmed my message a bit too aggressively while composing your
response, and I think that is what ended up confusing you.  

Here is what I wrote:

| > +	cd short-hand &&
| > +	test $(git rev-parse --symbolic-full-name HEAD) = "refs/heads/newbranch"
| 
| Broken &&-chain.
| 
| > +	branch=$(cd short-hand && git rev-parse --symbolic-full-name HEAD) &&
| > +	test "$branch" = refs/heads/newbranch &&
| > +	cd ..
| 
| If any of the command between "cd short-hand" and "cd .." failed,
| ...

The problematic "cd short-hand" is the one a few lines above where
you started quoting, not the one you saw in the $().

--
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



[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]