From: "Pat Notz" <patnotz@gmail.com>
To: git@vger.kernel.org
Subject: [PATCHv5 0/8] Add commit message options for rebase --autosquash
Date: Thu, 7 Oct 2010 13:10:49 -0600 [thread overview]
Message-ID: <1286478657-61581-1-git-send-email-patnotz@gmail.com> (raw)
This patch series adds new command line options to git-commit to make
it easy to specify messages for commits correctly formatted for use
wit 'rebase -i --autosquash'.
The first three patches introduce minor refactorings that set the stage
for subsequent patches.
The fourth patch teaches format_commit_message to reencode the content
if the caller's commit object uses an encoding different from the
commit encoding.
The remaining patches add the --fixup and --squash commands to
git-commit including tests of commit, interactions with rebase and
i18n encodings.
One issue which limits the testing (but not the implementation, I
think) is that when 'rebase --autosquash' is comparing commit subject
lines it does not first make sure that the commits use a common
encoding. That's follow-on work.
Pat Notz (8):
commit.c: prefer get_header() to manual searching
commit.c: new function for looking up a comit by name
pretty.c: helper methods for getting output encodings
pretty.c: teach format_commit_message() to reencode the output
commit: --fixup option for use with rebase --autosquash
add tests of commit --fixup
commit: --squash option for use with rebase --autosquash
add tests of commit --squash
Documentation/git-commit.txt | 21 +++++++++--
archive.c | 2 +-
builtin/commit.c | 76 +++++++++++++++++++++++++++------------
builtin/fmt-merge-msg.c | 2 +-
cache.h | 3 ++
commit.c | 13 +++++++
commit.h | 5 ++-
environment.c | 11 ++++++
log-tree.c | 2 +-
notes-cache.c | 2 +-
pretty.c | 47 +++++++++++++++++++-----
submodule.c | 4 +-
t/t3415-rebase-autosquash.sh | 29 ++++++++++++++-
t/t3900-i18n-commit.sh | 28 +++++++++++++++
t/t7500-commit.sh | 80 ++++++++++++++++++++++++++++++++++++++++++
t/t7500/edit-content | 4 ++
16 files changed, 283 insertions(+), 46 deletions(-)
create mode 100755 t/t7500/edit-content
--
1.7.3.1
next reply other threads:[~2010-10-07 19:11 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-07 19:10 Pat Notz [this message]
2010-10-07 19:10 ` [PATCHv5 1/8] commit.c: prefer get_header() to manual searching Pat Notz
2010-10-07 21:11 ` Sverre Rabbelier
2010-10-07 21:12 ` Sverre Rabbelier
2010-10-13 21:59 ` Junio C Hamano
2010-10-07 19:10 ` [PATCHv5 2/8] commit.c: new function for looking up a comit by name Pat Notz
2010-10-13 21:59 ` Junio C Hamano
2010-10-07 19:10 ` [PATCHv5 3/8] pretty.c: helper methods for getting output encodings Pat Notz
2010-10-07 19:10 ` [PATCHv5 4/8] pretty.c: teach format_commit_message() to reencode the output Pat Notz
2010-10-13 21:59 ` Junio C Hamano
2010-10-13 22:44 ` Pat Notz
2010-10-07 19:10 ` [PATCHv5 5/8] commit: --fixup option for use with rebase --autosquash Pat Notz
2010-10-07 19:10 ` [PATCHv5 6/8] add tests of commit --fixup Pat Notz
2010-10-07 19:10 ` [PATCHv5 7/8] commit: --squash option for use with rebase --autosquash Pat Notz
2010-10-07 19:10 ` [PATCHv5 8/8] add tests of commit --squash Pat Notz
2010-10-11 21:06 ` [PATCHv5 0/8] Add commit message options for rebase --autosquash Pat Notz
2010-10-12 9:36 ` Sverre Rabbelier
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=1286478657-61581-1-git-send-email-patnotz@gmail.com \
--to=patnotz@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.
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).