From: greened@obbligato.org
To: Techlive Zheng <techlivezheng@gmail.com>
Cc: git@vger.kernel.org, gitster@pobox.com, apenwarr@gmail.com
Subject: Re: [PATCH/RFC] [git-subtree.sh] Use raw subject and body modifier "%B" instead of "%s%n%n%b" for commit
Date: Mon, 20 Aug 2012 20:52:15 -0500 [thread overview]
Message-ID: <87628df1v4.fsf@waller.obbligato.org> (raw)
In-Reply-To: <1344561358-2953-1-git-send-email-techlivezheng@gmail.com> (Techlive Zheng's message of "Fri, 10 Aug 2012 09:15:57 +0800")
Techlive Zheng <techlivezheng@gmail.com> writes:
> I don't know if it is the right place to post this patch, I have sended
> an email to the original author apenwarr and have no response. According
> to <https://github.com/apenwarr/git-subtree/blob/master/THIS-REPO-IS-OBSOLETE>,
> this is the place, but <https://github.com/git/git/blob/master/contrib/README> says
> different, which is really confusing. Anyway, here I am.
This is the place.
> Recently, I imported a foreign git project as a sub directory into a
> main repo which I intend to maintain as primary.
Ok.
> Due to the project I imported has its own remote repo which hosted
> on the github, I expected after a 'git-subtree.sh split' the newly
> generated subtree branch would be exactly identical to the original
> branch.
I would have thought so too.
> Unfortunately, it is not. I have fixed the committer date and make
> everything looks the same with the original branch, but they just did
> not end up with same commit sha1 hash. Then, I used `git cat-file -p`
> to view the raw output of the both commits and found that the commit
> generate by git-subtree has a extra 'new-line' character appended at
> the end of the subject which causes the problem.
Hmm.
> I checked the source and found "%s%n%n%b" were used to generate the
> commit message, this works the fine when a commit has a subject as
> well as a body, but most of my commits only have a subject under
> which condition a extra 'new-line' character is appended.
Ah. Yes, we should fix this.
> Instead, a raw subject and body message modifier '%B' should be used.
Ok.
> Though I think this patch should be applied by default, but the mistake
> has been there for a long time, applying this patch may cause the patched
> git-subtree generate a different branch for those whose subtree branch
> has already been generated using the old git-subtree. Maybe this should
> be explained in the help or man page, and add a condition check or a
> compatible mode somehow.
The problem is in the split code? I'm not sure this is a big issue. I
can run some experiments.
-Dave
prev parent reply other threads:[~2012-08-21 2:24 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-10 1:15 [PATCH/RFC] [git-subtree.sh] Use raw subject and body modifier "%B" instead of "%s%n%n%b" for commit Techlive Zheng
2012-08-10 1:15 ` [PATCH] subtree.sh: Use raw subject and body modifier "%B" instead of "%s%n%n%b" Techlive Zheng
2012-08-21 1:56 ` greened
2012-12-31 22:57 ` greened
2013-01-01 3:59 ` greened
2012-08-21 1:52 ` greened [this message]
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=87628df1v4.fsf@waller.obbligato.org \
--to=greened@obbligato.org \
--cc=apenwarr@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=techlivezheng@gmail.com \
/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).