From: Junio C Hamano <gitster@pobox.com>
To: git@vger.kernel.org
Subject: [PATCH 0/4] Fix longstanding "git am" bug
Date: Thu, 4 Dec 2008 18:22:56 -0800 [thread overview]
Message-ID: <1228443780-3386-1-git-send-email-gitster@pobox.com> (raw)
Simon Schubert rerolled a patch to add "git am --directory=<dir>" from
three months ago, which is a good complement to existing "git am -p<n>",
but it had the same issue of duplicating an existing bug to the new feature.
Let's fix the existing bug first, before accepting any new feature, which
will happen after 1.6.1 goes final.
Junio C Hamano (4):
git-am --whitespace: do not lose the command line option
git-am: propagate -C<n>, -p<n> options as well
git-am: propagate --3way options as well
Test that git-am does not lose -C/-p/--whitespace options
git-am.sh | 15 +++++++++----
t/t4252-am-options.sh | 54 +++++++++++++++++++++++++++++++++++++++++++++++++
t/t4252/am-test-1-1 | 19 +++++++++++++++++
t/t4252/am-test-1-2 | 21 +++++++++++++++++++
t/t4252/am-test-2-1 | 19 +++++++++++++++++
t/t4252/am-test-2-2 | 21 +++++++++++++++++++
t/t4252/am-test-3-1 | 19 +++++++++++++++++
t/t4252/am-test-3-2 | 21 +++++++++++++++++++
t/t4252/am-test-4-1 | 19 +++++++++++++++++
t/t4252/am-test-4-2 | 22 ++++++++++++++++++++
t/t4252/file-1-0 | 7 ++++++
t/t4252/file-2-0 | 7 ++++++
12 files changed, 239 insertions(+), 5 deletions(-)
create mode 100755 t/t4252-am-options.sh
create mode 100644 t/t4252/am-test-1-1
create mode 100644 t/t4252/am-test-1-2
create mode 100644 t/t4252/am-test-2-1
create mode 100644 t/t4252/am-test-2-2
create mode 100644 t/t4252/am-test-3-1
create mode 100644 t/t4252/am-test-3-2
create mode 100644 t/t4252/am-test-4-1
create mode 100644 t/t4252/am-test-4-2
create mode 100644 t/t4252/file-1-0
create mode 100644 t/t4252/file-2-0
next reply other threads:[~2008-12-05 2:24 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-12-05 2:22 Junio C Hamano [this message]
2008-12-05 2:22 ` [PATCH 1/4] git-am --whitespace: do not lose the command line option Junio C Hamano
2008-12-05 2:22 ` [PATCH 2/4] git-am: propagate -C<n>, -p<n> options as well Junio C Hamano
2008-12-05 2:22 ` [PATCH 3/4] git-am: propagate --3way " Junio C Hamano
2008-12-05 2:23 ` [PATCH 4/4] Test that git-am does not lose -C/-p/--whitespace options Junio C Hamano
2008-12-05 12:21 ` [PATCH 2/4] git-am: propagate -C<n>, -p<n> options as well Johannes Schindelin
2008-12-05 19:18 ` 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=1228443780-3386-1-git-send-email-gitster@pobox.com \
--to=gitster@pobox.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).