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

[PATCH 3/5] reset --hard: skip blank lines when reporting the commit subject

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
Jun 29, 2016, 14:14 UTC
Message-ID
<fd3b5aee740e88ceff0fbe77c61a10767c4f8622.1467209576.git.johannes.schindelin@gmx.de>
In-Reply-To
<cover.1467209576.git.johannes.schindelin@gmx.de>

When there are blank lines at the beginning of a commit message, the pretty printing machinery already skips them when showing a commit subject (or the complete commit message). We shall henceforth do the same when reporting the commit subject after the user called

	git reset --hard <commit>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 builtin/reset.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/reset.c b/builtin/reset.c
index acd6278..5c6206b 100644
--- a/builtin/reset.c
+++ b/builtin/reset.c
@@ -103,7 +103,7 @@ static void print_new_head_line(struct commit *commit)
 	if (body) {
 		const char *eol;
 		size_t len;
-		body += 2;
+		body = skip_blank_lines(body + 2);
 		eol = strchr(body, '\n');
 		len = eol ? eol - body : strlen(body);
 		printf(" %.*s\n", (int) len, body);
-- 
2.9.0.270.g810e421
Previous: Junio C HamanoNext: Johannes Schindelin
Message 6 of 11 in “Use skip_blank_lines() for more commit messages”
  1. 0/5 Use skip_blank_lines() for more commit messagesJohannes Schindelin, Jun 29, 2016
  2. 1/5 commit -C: skip blank lines at the beginning of the messageJohannes Schindelin, Jun 29, 2016
  3. Junio C HamanoJun 29, 2016
  4. 2/5 sequencer: use skip_blank_lines() to find the commit subjectJohannes Schindelin, Jun 29, 2016
  5. Junio C HamanoJun 29, 2016
  6. 3/5 reset --hard: skip blank lines when reporting the commit subjectJohannes Schindelin, Jun 29, 2016
  7. 4/5 commit -S: avoid invalid pointer with empty messageJohannes Schindelin, Jun 29, 2016
  8. 5/5 Skip blank lines when matching <commit>^{/foo}Johannes Schindelin, Jun 29, 2016
  9. Junio C HamanoJun 29, 2016
  10. Johannes SchindelinJul 2, 2016
  11. Junio C HamanoJun 29, 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.