From: Yubin Ruan <ablacktshirt@gmail.com>
To: Philip Oakley <philipoakley@iee.org>
Cc: git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>
Subject: Re: Meaning of two commit-ish hash in git diff
Date: Wed, 1 Nov 2017 09:07:20 +0800 [thread overview]
Message-ID: <127f7748-4b5d-f6be-2c64-fa4ee079b871@gmail.com> (raw)
In-Reply-To: <2A1B66E868594FC984FED8F0EDEAF900@PhilipOakley>
Thanks Philip,
On 11/01/2017 08:27 AM, Philip Oakley wrote:
> Yubin ,
>
> From: "Junio C Hamano" <gitster@pobox.com>
>> Yubin Ruan <ablacktshirt@gmail.com> writes:
>>
>>> diff --git a/path/somefile b/path/somefile
>>> index f8886b4..a1c96df 100644
>>> --- a/path/somefile
>>> +++ b/path/somefile
>>> <snip>
>>>
>>> This is output by a `git diff` between two adjacent commits but they are
>>> not any commit hash. I grep through the whole $(git log) but still cannot
>>> find those hash.
>>
>> The f8886b4 you see on the left is the name of the blob object on
>> the left hand side of the comparison that produced this output;
>> similarly a1c96df is the name of the blob object on the right hand
>> side of the comparison.
>>
>> IOW, if you have the contents of the blob whose object name is
>> f8886b4, by applying this patch, you will get a blob whose object
>> name is a1c96df.
>>
>> The information is used by "git am -3" when the patch does not apply
>> cleanly to fall back to the 3-way merge.
>
> The ability to 'git describe` those blob object IDs is currently the subject of a patch series
> https://public-inbox.org/git/20171031211852.13001-1-sbeller@google.com/
>
> Maybe see if would have helped ;-)
What would be other use case of the blob object / blob name ?
Yubin
next prev parent reply other threads:[~2017-11-01 1:06 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-31 3:24 Meaning of two commit-ish hash in git diff Yubin Ruan
2017-10-31 4:28 ` Junio C Hamano
2017-11-01 0:27 ` Philip Oakley
2017-11-01 1:07 ` Yubin Ruan [this message]
2017-11-01 2:48 ` Junio C Hamano
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=127f7748-4b5d-f6be-2c64-fa4ee079b871@gmail.com \
--to=ablacktshirt@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=philipoakley@iee.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.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox