From: Jon Seymour <jon.seymour@gmail.com>
To: Andreas Schwab <schwab@linux-m68k.org>
Cc: Antriksh Pany <antriksh.pany@gmail.com>, git@vger.kernel.org
Subject: Re: Need to change old commit (and regenerate tree)
Date: Fri, 21 May 2010 09:05:46 +1000 [thread overview]
Message-ID: <AANLkTim0M-PJC655bhfcQ6mBYTPt9TK9Ys8qJBJd1UPS@mail.gmail.com> (raw)
In-Reply-To: <m2sk5mtecw.fsf@igel.home>
On Fri, May 21, 2010 at 8:09 AM, Andreas Schwab <schwab@linux-m68k.org> wrote:
> Antriksh Pany <antriksh.pany@gmail.com> writes:
>
>> Instead of (what I initially expected):
>>
>> A--------o--------o--------o--------o(old B)--------o--------o--------o(old C)
>>
>> A2--------o--------o--------o--------B--------o--------o--------C
>>
>>
>> So what I am missing here? Aren't the new commits B~1, B~2, B~3
>> identical to C~4, C~5, C~6 (respectively) in all ways so as to have
>> gotten them the same SHA1 and hence appear as what I expected them to
>> appear?
>
> No, they have a different commit time, which is also part of the hash.
>
Of course, even if the commit time was forged to be the same, the
parent of B~3 is different to the parent of C~6 and since the parent
is also contributes bits to the respective hashes, B~3 will
necessarily (unlikely hash collisions excepted!) have a different hash
to C~6
jon.
next prev parent reply other threads:[~2010-05-20 23:05 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-20 19:17 Need to change old commit (and regenerate tree) Antriksh Pany
2010-05-20 22:09 ` Andreas Schwab
2010-05-20 23:05 ` Jon Seymour [this message]
2010-05-21 18:18 ` Antriksh Pany
2010-05-21 5:31 ` Geert Uytterhoeven
2010-05-21 21:46 ` Antriksh Pany
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=AANLkTim0M-PJC655bhfcQ6mBYTPt9TK9Ys8qJBJd1UPS@mail.gmail.com \
--to=jon.seymour@gmail.com \
--cc=antriksh.pany@gmail.com \
--cc=git@vger.kernel.org \
--cc=schwab@linux-m68k.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;
as well as URLs for NNTP newsgroup(s).