Re: [PATCH 3/3] git-add --intent-to-add (-N)

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

 



Hi,

Junio C Hamano wrote:

> Didn't I already tell you that you seem to have picked only one out of
> _three_ patch series?

I am using all three patches.  If you try ">a && git add -N a && git
commit" in an empty repo, you should get the same behavior (I checked
with commit 038a213^2, which is three commits ahead of master).  And
yes, I do understand where your suspicion came from.

But the reason for the behavior is that update_one in cache-tree.c
contains the test

	if (mode != S_IFGITLINK && !missing_ok && !has_sha1_file(sha1))

which fails for the empty blob in a new repo because, as I said, we
don't have that sha1 file.

I still wonder, do we want to pretend we have that object on disk
and proceed with the commit, or are the hardcoded objects only
supposed to be sufficient for in-core use?  If the former, I will
have to make some tests to be comfortable: are the objects properly
transfered to older clients without the hardcoded objects, etc.  But
I don't want to bother if that is not the intent.

Hoping that is clearer,
Jonathan
--
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]

  Powered by Linux