From: Michael J Gruber <git@drmicha.warpmail.net>
To: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: Why does git-patch-id(1) sometimes print two lines, one of which has commit = 0000000000000000000000000000000000000000
Date: Wed, 16 Feb 2011 17:11:42 +0100 [thread overview]
Message-ID: <4D5BF73E.50002@drmicha.warpmail.net> (raw)
In-Reply-To: <AANLkTimHvA_LsU4YaiDHDKoXnsk5WgGCXgbuSJ99emXw@mail.gmail.com>
Ævar Arnfjörð Bjarmason venit, vidit, dixit 16.02.2011 15:56:
> This behaves as I'd expect on git.git, i.e. shows a patch id and the commit id:
>
> $ git show 24231e063f0f003f8ffd7b64c7ba6a0baaaa5283 | git patch-id
> f10c69e0e5b33da206f37bd93639875555ac9b79
> 24231e063f0f003f8ffd7b64c7ba6a0baaaa5283
>
> But what does this mean, also on git.git:
>
> $ git show 7d48e9e6f77d336376c1a554eeff0590f77e1ee1 | git patch-id
> 4ba8a248731c5fcbd09cacb248d3128e742d1c90
> 7d48e9e6f77d336376c1a554eeff0590f77e1ee1
> d019b35e0b859cdd6907ee170927de1124c0ed6e
> 0000000000000000000000000000000000000000
>
> 7d48e9e6f77d336376c1a554eeff0590f77e1ee1 is just one of the commits
> that results in this output:
>
> $ git log --pretty=format:%H -p | git patch-id | grep
> 0000000000000000000000000000000000000000
> d019b35e0b859cdd6907ee170927de1124c0ed6e
> 0000000000000000000000000000000000000000
> 3b23a2a11055aef557369971e825010879a8c4d7
> 0000000000000000000000000000000000000000
> d498fbbad6f1374d952925df699da237c3e8f2df
> 0000000000000000000000000000000000000000
> b0c930dc1926ffae9cca022797856762fa908be6
> 0000000000000000000000000000000000000000
You're telling us that patch-ids, not the sha1's of affected commits here.
>
> And on another repository where I'm dealing with this I have a bunch
> more of them.
>
> Why are they there and what do they mean? Maybe it's a bug, or
> something I can explain in the manual page.
You would have to explain that git-patch-id trips over "\ Now
newline..." lines in our diffs. Alternatively, wait a few minutes for my
patch (done) with a test (the boring part...).
Cheers,
Michael
next prev parent reply other threads:[~2011-02-16 16:14 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-16 14:56 Why does git-patch-id(1) sometimes print two lines, one of which has commit = 0000000000000000000000000000000000000000 Ævar Arnfjörð Bjarmason
2011-02-16 16:11 ` Michael J Gruber [this message]
2011-02-16 16:55 ` [PATCH 1/2] git-patch-id: test for "no newline" markers Michael J Gruber
2011-02-16 16:55 ` [PATCH 2/2] git-patch-id: do not trip over " Michael J Gruber
2011-02-16 20:05 ` Junio C Hamano
2011-02-17 7:44 ` [PATCHv2 1/2] git-patch-id: test for " Michael J Gruber
2011-02-17 7:44 ` [PATCHv2 2/2] git-patch-id: do not trip over " Michael J Gruber
2011-02-18 4:16 ` Jeff King
2011-02-18 8:02 ` Michael J Gruber
2011-02-18 10:12 ` [PATCHv3 1/2] git-patch-id: test for " Michael J Gruber
2011-02-18 10:12 ` [PATCHv3 2/2] git-patch-id: do not trip over " Michael J Gruber
2011-02-18 10:41 ` Jeff King
2011-02-18 10:43 ` Michael J Gruber
2011-02-18 10:47 ` Jeff King
2011-02-18 14:29 ` Jakub Narebski
2011-02-18 10:40 ` [PATCHv2 " Jeff King
2011-02-17 11:55 ` [PATCHv2 1/2] git-patch-id: test for " Jakub Narebski
2011-02-17 12:11 ` Michael J Gruber
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4D5BF73E.50002@drmicha.warpmail.net \
--to=git@drmicha.warpmail.net \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).