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

[WIP PATCH 2/6] unpack-trees: typofix

From
Junio C Hamano <gitster@pobox.com>
Date
Sep 20, 2009, 05:06 UTC
Message-ID
<1253423175-6339-3-git-send-email-gitster@pobox.com>
In-Reply-To
<1253423175-6339-1-git-send-email-gitster@pobox.com>
I am not good at subject-verb concordance.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
 unpack-trees.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/unpack-trees.c b/unpack-trees.c
index 720f7a1..d174fe0 100644
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -617,7 +617,7 @@ static int verify_absent(struct cache_entry *ce, const char *action,
 			 * found "foo/." in the working tree.
 			 * This is tricky -- if we have modified
 			 * files that are in "foo/" we would lose
-			 * it.
+			 * them.
 			 */
 			ret = verify_clean_subdirectory(ce, action, o);
 			if (ret < 0)
-- 
1.6.5.rc1.90.ga3b1b
Previous: Junio C HamanoNext: Junio C Hamano
Message 3 of 7 in “Merging with D/F conflicts”
  1. 0/6 Merging with D/F conflictsJunio C Hamano, Sep 20, 2009
  2. 1/6 diff-lib.c: fix misleading comments on oneway_diff()Junio C Hamano, Sep 20, 2009
  3. 2/6 unpack-trees: typofixJunio C Hamano, Sep 20, 2009
  4. 3/6 unpack_callback(): use unpack_failed() consistentlyJunio C Hamano, Sep 20, 2009
  5. 4/6 traverse_trees(): handle D/F conflict case sanelyJunio C Hamano, Sep 20, 2009
  6. 5/6 unpack-trees.c: prepare for looking ahead in the indexJunio C Hamano, Sep 20, 2009
  7. 6/6 read-tree --debug-unpackJunio C Hamano, Sep 20, 2009

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.