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

Re: [PATCHv5 20/23] git notes merge: Add testcases for merging notes trees at different fanouts

From
Johan Herland <johan@herland.net>
Date
Nov 1, 2010, 00:09 UTC
Message-ID
<201011010109.38459.johan@herland.net>
In-Reply-To
<7vwrp16o21.fsf@alter.siamese.dyndns.org>
On Friday 29 October 2010, Junio C Hamano wrote:
Show 15 quoted lines
> Subject: [PATCH] portability fix for [20/23]
> 
>     test "$(line generator | wc -l)" = $expected_number_of_lines (bad)
> 
> is not portable, as "wc -l" can prefix the number with whitespaces.
> 
> Either write the $(... | wc -l) without enclosing in a dq pair, i.e.
> 
>     test $(line generator | wc -l) = $expected_number_of_lines (good)
> 
> or compare them numerically with
> 
>     test "$(... | wc -l)" -eq $num (ok)
> 
> The former is preferred for readability.
Ack. I'll fold this fix into the next iteration.
Thanks!
...Johan
-- 
Johan Herland, <johan@herland.net>
www.herland.net
Previous: Junio C HamanoNext: Johan Herland
Message 23 of 31 in “[PATCHv5 00/23] git notes merge”
  1. Johan HerlandOct 25, 2010
  2. 01/23 notes.c: Hexify SHA1 in die() message from init_notes()Johan Herland, Oct 25, 2010
  3. 02/23 (trivial) notes.h: Minor documentation fixes to copy_notes()Johan Herland, Oct 25, 2010
  4. 03/23 notes.h: Make default_notes_ref() available in notes APIJohan Herland, Oct 25, 2010
  5. 04/23 notes.c: Reorder functions in preparation for next commitJohan Herland, Oct 25, 2010
  6. 05/23 notes.h/c: Allow combine_notes functions to remove notesJohan Herland, Oct 25, 2010
  7. 06/23 notes.h/c: Propagate combine_notes_fn return value to add_note() and beyondJohan Herland, Oct 25, 2010
  8. 07/23 (trivial) t3303: Indent with tabs instead of spaces for consistencyJohan Herland, Oct 25, 2010
  9. 08/23 notes.c: Use two newlines (instead of one) when concatenating notesJohan Herland, Oct 25, 2010
  10. 09/23 builtin/notes.c: Split notes ref DWIMmery into a separate functionJohan Herland, Oct 25, 2010
  11. 10/23 git notes merge: Initial implementation handling trivial merges onlyJohan Herland, Oct 25, 2010
  12. 11/23 builtin/notes.c: Refactor creation of notes commits.Johan Herland, Oct 25, 2010
  13. 12/23 git notes merge: Handle real, non-conflicting notes mergesJohan Herland, Oct 25, 2010
  14. 13/23 git notes merge: Add automatic conflict resolvers (ours, theirs, union)Johan Herland, Oct 25, 2010
  15. 14/23 Documentation: Preliminary docs on 'git notes merge'Johan Herland, Oct 25, 2010
  16. 15/23 git notes merge: Manual conflict resolution, part 1/2Johan Herland, Oct 25, 2010
  17. 16/23 git notes merge: Manual conflict resolution, part 2/2Johan Herland, Oct 25, 2010
  18. 17/23 git notes merge: List conflicting notes in notes merge commit messageJohan Herland, Oct 25, 2010
  19. 18/23 git notes merge: --commit should fail if underlying notes ref has movedJohan Herland, Oct 25, 2010
  20. 19/23 git notes merge: Add another auto-resolving strategy: "cat_sort_uniq"Johan Herland, Oct 25, 2010
  21. 20/23 git notes merge: Add testcases for merging notes trees at different fanoutsJohan Herland, Oct 25, 2010
  22. Junio C HamanoOct 29, 2010
  23. Johan HerlandNov 1, 2010
  24. 21/23 Provide 'git notes get-ref' to easily retrieve current notes refJohan Herland, Oct 25, 2010
  25. 22/23 cmd_merge(): Parse options before checking MERGE_HEADJohan Herland, Oct 25, 2010
  26. 23/23 Provide 'git merge --abort' as a synonym to 'git reset --merge'Johan Herland, Oct 25, 2010
  27. Jonathan NiederOct 25, 2010
  28. Johan HerlandOct 25, 2010
  29. Johan HerlandOct 26, 2010
  30. 22/23 cmd_merge(): Parse options before checking MERGE_HEADJohan Herland, Oct 26, 2010
  31. 23/23 Provide 'git merge --abort' as a synonym to 'git reset --merge'Johan Herland, Oct 26, 2010

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.