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 v3 0/4] Add an option to git-format-patch to record base tree info
Date: Thu, 31 Mar 2016 09:46:12 +0800 [thread overview]
Message-ID: <1459388776-18066-1-git-send-email-xiaolong.ye@intel.com> (raw)
V3 mainly improves the implementation according to Junio's comments,
Changes vs v2 include:
- Remove the unnecessary output line "** base-commit-info **".
- Improve the traverse logic to handle not only linear topology, but more
general cases, it will start revision walk by setting the starting points
of the traversal to all elements in the rev list[], and skip the ones in
list[], only grab the patch-ids of prerequisite patches.
- If --base=auto is set, it will get merge base of upstream and rev range
we specified and use it as base commit. If there is no upstream, we just
error out and suggest to use set-upstream-to to track a remote branch
as upstream.
v1 can be found here: http://article.gmane.org/gmane.comp.version-control.git/286873
v2 can be found here: http://article.gmane.org/gmane.comp.version-control.git/289603
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 | 31 ++++++++++
builtin/log.c | 119 +++++++++++++++++++++++++++++++++++++
patch-ids.c | 2 +-
patch-ids.h | 2 +
4 files changed, 153 insertions(+), 1 deletion(-)
--
2.8.0.4.gcb5a9af
base-commit: 90f7b16b3adc78d4bbabbd426fb69aa78c714f71
next reply other threads:[~2016-03-31 1:48 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-31 1:46 Xiaolong Ye [this message]
2016-03-31 1:46 ` [PATCH v3 1/4] patch-ids: make commit_patch_id() a public helper function Xiaolong Ye
2016-03-31 1:46 ` [PATCH v3 2/4] format-patch: add '--base' option to record base tree info Xiaolong Ye
2016-03-31 17:38 ` Junio C Hamano
2016-04-01 13:38 ` Ye Xiaolong
2016-04-01 16:00 ` Junio C Hamano
2016-04-05 5:52 ` Ye Xiaolong
2016-04-09 15:56 ` Ye Xiaolong
2016-03-31 1:46 ` [PATCH v3 3/4] format-patch: introduce --base=auto option Xiaolong Ye
2016-03-31 17:43 ` Junio C Hamano
2016-04-01 13:52 ` Ye Xiaolong
2016-04-01 16:06 ` Junio C Hamano
2016-04-05 6:36 ` Ye Xiaolong
2016-04-05 7:21 ` Junio C Hamano
2016-03-31 1:46 ` [PATCH v3 4/4] format-patch: introduce format.base configuration Xiaolong Ye
2016-03-31 17:45 ` [PATCH v3 0/4] Add an option to git-format-patch to record base tree info 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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1459388776-18066-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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).