git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH v4 0/4] Add --base option to git-format-patch to record base tree info

From
Xiaolong Ye <xiaolong.ye@intel.com>
Date
Apr 11, 2016, 02:47 UTC
Message-ID
<1460342873-28900-1-git-send-email-xiaolong.ye@intel.com>
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
Next: Xiaolong Ye
Message 1 of 11 in “Add --base option to git-format-patch to record base tree info”
  1. 0/4 Add --base option to git-format-patch to record base tree infoXiaolong Ye, Apr 11, 2016
  2. 1/4 patch-ids: make commit_patch_id() a public helper functionXiaolong Ye, Apr 11, 2016
  3. 2/4 format-patch: add '--base' option to record base tree infoXiaolong Ye, Apr 11, 2016
  4. Junio C HamanoApr 12, 2016
  5. Ye XiaolongApr 13, 2016
  6. Ye XiaolongApr 14, 2016
  7. Junio C HamanoApr 14, 2016
  8. 3/4 format-patch: introduce --base=auto optionXiaolong Ye, Apr 11, 2016
  9. 4/4 format-patch: introduce format.base configurationXiaolong Ye, Apr 11, 2016
  10. Junio C HamanoApr 12, 2016
  11. Ye XiaolongApr 13, 2016

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.