git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Xiaolong Ye <xiaolong.ye@intel.com>
To: git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>
Cc: fengguang.wu@intel.com, ying.huang@intel.com,
	philip.li@intel.com, julie.du@intel.com,
	Xiaolong Ye <xiaolong.ye@intel.com>
Subject: [PATCH v5 0/4] Add --base option to git-format-patch to record base tree info
Date: Fri, 22 Apr 2016 13:42:32 +0800	[thread overview]
Message-ID: <1461303756-25975-1-git-send-email-xiaolong.ye@intel.com> (raw)

Thanks for Junio's reviews and suggestions.

This version contains the following changes since v4:

 - Refine the commit log as well as the documentation according to
   Junio's comments.

 - Separate out get_base_commit function from prepare_bases to obtain
   the base commit.

 - Use repeated pair-wise computation to get the merge base for the
   validation of base commit.

 - Extract "auto handling thing" from prepare_bases and put it into
   get_base_commit.

 - Use format.useAutoBase boolean variable for the auto configuration
   in format section.


Thanks,
Xiaolong.

Xiaolong Ye (4):
  patch-ids: make commit_patch_id() a public helper function
  format-patch: add '--base' option to record base tree info
  format-patch: introduce --base=auto option
  format-patch: introduce format.useAutoBase configuration

 Documentation/config.txt           |   5 ++
 Documentation/git-format-patch.txt |  60 ++++++++++++++
 builtin/log.c                      | 165 +++++++++++++++++++++++++++++++++++++
 patch-ids.c                        |   2 +-
 patch-ids.h                        |   2 +
 t/t4014-format-patch.sh            |  48 +++++++++++
 6 files changed, 281 insertions(+), 1 deletion(-)

-- 
2.8.1.221.ga4c6ba7

base-commit: e6ac6e1f7d54584c2b03f073b5f329a37f4a9561

             reply	other threads:[~2016-04-22  5:44 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-04-22  5:42 Xiaolong Ye [this message]
2016-04-22  5:42 ` [PATCH v5 1/4] patch-ids: make commit_patch_id() a public helper function Xiaolong Ye
2016-04-22  5:42 ` [PATCH v5 2/4] format-patch: add '--base' option to record base tree info Xiaolong Ye
2016-04-22 21:39   ` Junio C Hamano
2016-04-24  3:05     ` Ye Xiaolong
2016-04-22 21:52   ` Junio C Hamano
2016-04-22 21:59   ` Junio C Hamano
2016-04-24  4:36     ` Ye Xiaolong
2016-04-22  5:42 ` [PATCH v5 3/4] format-patch: introduce --base=auto option Xiaolong Ye
2016-04-22 21:54   ` Junio C Hamano
2016-04-24  4:32     ` Ye Xiaolong
2016-04-22  5:42 ` [PATCH v5 4/4] format-patch: introduce format.useAutoBase configuration Xiaolong Ye

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=1461303756-25975-1-git-send-email-xiaolong.ye@intel.com \
    --to=xiaolong.ye@intel.com \
    --cc=fengguang.wu@intel.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=julie.du@intel.com \
    --cc=philip.li@intel.com \
    --cc=ying.huang@intel.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).