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 v4 0/4] Add --base option to git-format-patch to record base tree info
Date: Mon, 11 Apr 2016 10:47:49 +0800	[thread overview]
Message-ID: <1460342873-28900-1-git-send-email-xiaolong.ye@intel.com> (raw)

V4 mainly addresses Junio's comments on V3, Changes include:

 - Polish up the documentation to make output files git-format-patch.1 and
   git-format-patch.html more sensible.

 - Add error handling when base commit is not ancestor of revision list
   specified in cmdline.

 - Specify topo order to do the traverse work, and show the base tree info
   block in a more natural sequence.
 
 - If --base=auto is set and there is more than one best merge base, instead
   of picking up a random one, it will error out for they may be complicated
   situation such as criss-cross merges.

 - Add tests for the --base option and format.base configuration.

 - Fix a segfault error due to bases structure hasn't been initialized when
   --base option is not set, Thanks for Ramsay's report.

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.base configuration

 Documentation/git-format-patch.txt |  64 +++++++++++++++++++
 builtin/log.c                      | 123 +++++++++++++++++++++++++++++++++++++
 patch-ids.c                        |   2 +-
 patch-ids.h                        |   2 +
 t/t4014-format-patch.sh            |  48 +++++++++++++++
 5 files changed, 238 insertions(+), 1 deletion(-)

-- 
2.8.1.120.g24d6b3f

base-commit: 7b0d47b3b6b5b64e02a5aa06b0452cadcdb18355

             reply	other threads:[~2016-04-11  2:48 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-04-11  2:47 Xiaolong Ye [this message]
2016-04-11  2:47 ` [PATCH v4 1/4] patch-ids: make commit_patch_id() a public helper function Xiaolong Ye
2016-04-11  2:47 ` [PATCH v4 2/4] format-patch: add '--base' option to record base tree info Xiaolong Ye
2016-04-12 19:08   ` Junio C Hamano
2016-04-13 14:42     ` Ye Xiaolong
2016-04-14 14:23     ` Ye Xiaolong
2016-04-14 16:23       ` Junio C Hamano
2016-04-11  2:47 ` [PATCH v4 3/4] format-patch: introduce --base=auto option Xiaolong Ye
2016-04-11  2:47 ` [PATCH v4 4/4] format-patch: introduce format.base configuration Xiaolong Ye
2016-04-12 19:47   ` Junio C Hamano
2016-04-13 15:55     ` Ye Xiaolong

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=1460342873-28900-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).