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

[PATCH v6 44/45] builtin-am: check for valid committer ident

From
Paul Tan <pyokagan@gmail.com>
Date
Jul 19, 2015, 16:10 UTC
Message-ID
<1437322237-29863-45-git-send-email-pyokagan@gmail.com>
In-Reply-To
<1437322237-29863-1-git-send-email-pyokagan@gmail.com>

When commit_tree() is called, if the user does not have an explicit committer ident configured, it will attempt to construct a default committer ident based on the user's and system's info (e.g. gecos field, hostname etc.) However, if a default committer ident is unable to be constructed, commit_tree() will die(), but at this point of git-am's execution, there will already be changes made to the index and work tree.

This can be confusing to new users, and as such since d64e6b0 (Keep Porcelainish from failing by broken ident after making changes., 2006-02-18) git-am.sh will check to see if the committer ident has been configured, or a default one can be constructed, before even starting to apply patches.

Re-implement this in builtin/am.c.
Signed-off-by: Paul Tan <pyokagan@gmail.com>
---
 builtin/am.c | 3 +++
 1 file changed, 3 insertions(+)
diff --git a/builtin/am.c b/builtin/am.c
index 6a2b887..1fe2c65 100644
--- a/builtin/am.c
+++ b/builtin/am.c
@@ -2247,6 +2247,9 @@ int cmd_am(int argc, const char **argv, const char *prefix)
 		fprintf_ln(stderr, _("The -b/--binary option has been a no-op for long time, and\n"
 				"it will be removed. Please do not use it anymore."));
 
+	/* Ensure a valid committer ident can be constructed */
+	git_committer_info(IDENT_STRICT);
+
 	if (read_index_preload(&the_index, NULL) < 0)
 		die(_("failed to read the index"));
 

-- 
2.5.0.rc2.110.gb39b692
Previous: Paul TanNext: Paul Tan
Message 46 of 47 in “Make git-am a builtin”
  1. 00/45 Make git-am a builtinPaul Tan, Jul 19, 2015
  2. 01/45 wrapper: implement xopen()Paul Tan, Jul 19, 2015
  3. 02/45 wrapper: implement xfopen()Paul Tan, Jul 19, 2015
  4. 03/45 builtin-am: implement skeletal builtin amPaul Tan, Jul 19, 2015
  5. 04/45 builtin-am: implement patch queue mechanismPaul Tan, Jul 19, 2015
  6. 05/45 builtin-am: split out mbox/maildir patches with git-mailsplitPaul Tan, Jul 19, 2015
  7. 06/45 builtin-am: auto-detect mbox patchesPaul Tan, Jul 19, 2015
  8. 07/45 builtin-am: extract patch and commit info with git-mailinfoPaul Tan, Jul 19, 2015
  9. 08/45 builtin-am: apply patch with git-applyPaul Tan, Jul 19, 2015
  10. 09/45 builtin-am: implement committing applied patchPaul Tan, Jul 19, 2015
  11. 10/45 builtin-am: refuse to apply patches if index is dirtyPaul Tan, Jul 19, 2015
  12. 11/45 builtin-am: implement --resolved/--continuePaul Tan, Jul 19, 2015
  13. 12/45 builtin-am: don't parse mail when resumingPaul Tan, Jul 19, 2015
  14. 13/45 builtin-am: implement --skipPaul Tan, Jul 19, 2015
  15. 14/45 builtin-am: implement --abortPaul Tan, Jul 19, 2015
  16. Stefan BellerJul 31, 2015
  17. 15/45 builtin-am: reject patches when there's a session in progressPaul Tan, Jul 19, 2015
  18. 16/45 builtin-am: implement -q/--quietPaul Tan, Jul 19, 2015
  19. 17/45 builtin-am: exit with user friendly message on failurePaul Tan, Jul 19, 2015
  20. 18/45 builtin-am: implement -s/--signoffPaul Tan, Jul 19, 2015
  21. 19/45 cache-tree: introduce write_index_as_tree()Paul Tan, Jul 19, 2015
  22. 20/45 builtin-am: implement --3way, am.threeWayPaul Tan, Jul 19, 2015
  23. 21/45 builtin-am: implement --rebasing modePaul Tan, Jul 19, 2015
  24. 22/45 builtin-am: bypass git-mailinfo when --rebasingPaul Tan, Jul 19, 2015
  25. 23/45 builtin-am: handle stray state directoryPaul Tan, Jul 19, 2015
  26. 24/45 builtin-am: implement -u/--utf8Paul Tan, Jul 19, 2015
  27. 25/45 builtin-am: implement -k/--keep, --keep-non-patchPaul Tan, Jul 19, 2015
  28. 26/45 builtin-am: implement --[no-]message-id, am.messageidPaul Tan, Jul 19, 2015
  29. 27/45 builtin-am: support --keep-cr, am.keepcrPaul Tan, Jul 19, 2015
  30. 28/45 builtin-am: implement --[no-]scissorsPaul Tan, Jul 19, 2015
  31. 29/45 builtin-am: pass git-apply's options to git-applyPaul Tan, Jul 19, 2015
  32. 30/45 builtin-am: implement --ignore-datePaul Tan, Jul 19, 2015
  33. 31/45 builtin-am: implement --committer-date-is-author-datePaul Tan, Jul 19, 2015
  34. 32/45 builtin-am: implement -S/--gpg-sign, commit.gpgsignPaul Tan, Jul 19, 2015
  35. 33/45 builtin-am: invoke post-rewrite hookPaul Tan, Jul 19, 2015
  36. 34/45 builtin-am: support automatic notes copyingPaul Tan, Jul 19, 2015
  37. 35/45 builtin-am: invoke applypatch-msg hookPaul Tan, Jul 19, 2015
  38. 36/45 builtin-am: invoke pre-applypatch hookPaul Tan, Jul 19, 2015
  39. 37/45 builtin-am: invoke post-applypatch hookPaul Tan, Jul 19, 2015
  40. 38/45 builtin-am: rerere supportPaul Tan, Jul 19, 2015
  41. 39/45 builtin-am: support and auto-detect StGit patchesPaul Tan, Jul 19, 2015
  42. 40/45 builtin-am: support and auto-detect StGit series filesPaul Tan, Jul 19, 2015
  43. 41/45 builtin-am: support and auto-detect mercurial patchesPaul Tan, Jul 19, 2015
  44. 42/45 builtin-am: implement -i/--interactivePaul Tan, Jul 19, 2015
  45. 43/45 builtin-am: implement legacy -b/--binary optionPaul Tan, Jul 19, 2015
  46. 44/45 builtin-am: check for valid committer identPaul Tan, Jul 19, 2015
  47. 45/45 builtin-am: remove redirection to git-am.shPaul Tan, Jul 19, 2015

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.