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 v2 0/4] Add an option to git-format-patch to record base tree info
Date: Wed, 23 Mar 2016 16:52:23 +0800 [thread overview]
Message-ID: <1458723147-7335-1-git-send-email-xiaolong.ye@intel.com> (raw)
This is a re-roll of
http://article.gmane.org/gmane.comp.version-control.git/286873
It is almost a rewrite of v1, Changes include:
- Make commit_patch_id() a publib helper function, so it can be available to other modules.
- The new option "--base" will not only record the base commit id(a public well-known commit),
but also the prerequisite patches's patch ids, then the 0day test robot could get these info,
thus to checkout the well-known base tree-ish, apply the prerequisite patches and then the
patches being send can be applied to correct tree to be evaluated. (0day catches every patch
series to LKML and maintains a patch-id => commit-id database for in-flight patches.)
- For developers' convenience, we propose a new format.base configuration to track the base commit
automatically, if current branch the developer work on has its remote-tracking branch,
the base commit would be the tip commit of the remote branch, if current branch is not tracked
with any remote branch(eg. checkout by a local branch or a commit), thus its upstream could not
be obtained, it will just record the parent commit-id of the patch series, as well as patch-id for
reference.
so here is the text UI:
1) for the cases that exact base commit could be obtained(eithor from manual input --base=<base-commit-id>
or from upstream if base=auto is set)
** base-commit-info **
base-commit: ab5d01a29eb7380ceab070f0807c2939849c44bc
prerequisite-patch-id: 61400f965fdc0c2fbe8ad9cb5316c3efe6e05c14
prerequisite-patch-id: 063a398ef398647d8d839e6f9090d38ea9e0551c
2) for cases that exact base commit is failed to obtained
** parent-commit-info **
parent-commit: ab5d01a29eb7380ceab070f0807c2939849c44bc
parent-patch-id: caf2dae24db5b4c49a6c4134dd6d9908e898424b
Thanks for fengguang and junio's suggestions and prototype of implementation.
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.base configuration
Documentation/git-format-patch.txt | 20 ++++++
builtin/log.c | 137 +++++++++++++++++++++++++++++++++++++
patch-ids.c | 2 +-
patch-ids.h | 2 +
4 files changed, 160 insertions(+), 1 deletion(-)
--
2.8.0.rc4.4.ga41a987
** base-commit-info **
base-commit: 808ecd4cca75acac5e4868f15d3e647fc73698d3
next reply other threads:[~2016-03-23 8:53 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-23 8:52 Xiaolong Ye [this message]
2016-03-23 8:52 ` [PATCH v2 1/4] patch-ids: make commit_patch_id() a public helper function Xiaolong Ye
2016-03-23 8:52 ` [PATCH v2 2/4] format-patch: add '--base' option to record base tree info Xiaolong Ye
2016-03-23 18:08 ` Junio C Hamano
2016-03-24 3:08 ` Ye Xiaolong
2016-03-23 8:52 ` [PATCH v2 3/4] format-patch: introduce --base=auto option Xiaolong Ye
2016-03-23 18:25 ` Junio C Hamano
2016-03-24 4:19 ` Ye Xiaolong
2016-03-24 17:01 ` Junio C Hamano
2016-04-01 5:07 ` Ye Xiaolong
2016-04-01 16:36 ` Junio C Hamano
2016-03-23 8:52 ` [PATCH v2 4/4] format-patch: introduce format.base 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=1458723147-7335-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).