Re: [PATCHv1 2/2] git-p4: work with a detached head

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

 



On 9 September 2015 at 22:52, Junio C Hamano <gitster@xxxxxxxxx> wrote:
> Luke Diamand <luke@xxxxxxxxxxx> writes:
>
>>      def run(self, args):
>>          if len(args) == 0:
>>              self.master = currentGitBranch()
>> -            if len(self.master) == 0 or not gitBranchExists("refs/heads/%s" % self.master):
>> -                die("Detecting current git branch failed!")
>> +            if self.master == "undefined":
>> +                self.master = None
>
> The comparison with textual "undefined" smelled fishy and I ended up
> looking at the implementation of currentGitBranch().
>
>     def currentGitBranch():
>         return read_pipe("git name-rev HEAD").split(" ")[1].strip()
>
> Yuck.  I know it is not entirely the fault of this patch, but
> shouldn't it be reading from
>
>     $ git symbolic-ref HEAD
>
> and catch the error "fatal: ref HEAD is not a symbolic ref" and use
> it as a signal to tell that the HEAD is detached?

That sounds much nicer. I'll redo the patch accordingly.

Thanks,
Luke
--
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]