From: Johan Herland <johan@herland•net>
To: Junio C Hamano <gitster@pobox•com>
Cc: git@vger•kernel.org, jrnieder@gmail•com, bebarino@gmail•com,
avarab@gmail•com, srabbelier@gmail•com
Subject: Re: [PATCHv5 20/23] git notes merge: Add testcases for merging notes trees at different fanouts
Date: Mon, 01 Nov 2010 01:09:38 +0100 [thread overview]
Message-ID: <201011010109.38459.johan@herland.net> (raw)
In-Reply-To: <7vwrp16o21.fsf@alter.siamese.dyndns.org>
On Friday 29 October 2010, Junio C Hamano wrote:
> 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
next prev parent reply other threads:[~2010-11-01 0:10 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-25 0:08 [PATCHv5 00/23] git notes merge Johan Herland
2010-10-25 0:08 ` [PATCHv5 01/23] notes.c: Hexify SHA1 in die() message from init_notes() Johan Herland
2010-10-25 0:08 ` [PATCHv5 02/23] (trivial) notes.h: Minor documentation fixes to copy_notes() Johan Herland
2010-10-25 0:08 ` [PATCHv5 03/23] notes.h: Make default_notes_ref() available in notes API Johan Herland
2010-10-25 0:08 ` [PATCHv5 04/23] notes.c: Reorder functions in preparation for next commit Johan Herland
2010-10-25 0:08 ` [PATCHv5 05/23] notes.h/c: Allow combine_notes functions to remove notes Johan Herland
2010-10-25 0:08 ` [PATCHv5 06/23] notes.h/c: Propagate combine_notes_fn return value to add_note() and beyond Johan Herland
2010-10-25 0:08 ` [PATCHv5 07/23] (trivial) t3303: Indent with tabs instead of spaces for consistency Johan Herland
2010-10-25 0:08 ` [PATCHv5 08/23] notes.c: Use two newlines (instead of one) when concatenating notes Johan Herland
2010-10-25 0:08 ` [PATCHv5 09/23] builtin/notes.c: Split notes ref DWIMmery into a separate function Johan Herland
2010-10-25 0:08 ` [PATCHv5 10/23] git notes merge: Initial implementation handling trivial merges only Johan Herland
2010-10-25 0:08 ` [PATCHv5 11/23] builtin/notes.c: Refactor creation of notes commits Johan Herland
2010-10-25 0:08 ` [PATCHv5 12/23] git notes merge: Handle real, non-conflicting notes merges Johan Herland
2010-10-25 0:08 ` [PATCHv5 13/23] git notes merge: Add automatic conflict resolvers (ours, theirs, union) Johan Herland
2010-10-25 0:08 ` [PATCHv5 14/23] Documentation: Preliminary docs on 'git notes merge' Johan Herland
2010-10-25 0:08 ` [PATCHv5 15/23] git notes merge: Manual conflict resolution, part 1/2 Johan Herland
2010-10-25 0:08 ` [PATCHv5 16/23] git notes merge: Manual conflict resolution, part 2/2 Johan Herland
2010-10-25 0:08 ` [PATCHv5 17/23] git notes merge: List conflicting notes in notes merge commit message Johan Herland
2010-10-25 0:08 ` [PATCHv5 18/23] git notes merge: --commit should fail if underlying notes ref has moved Johan Herland
2010-10-25 0:08 ` [PATCHv5 19/23] git notes merge: Add another auto-resolving strategy: "cat_sort_uniq" Johan Herland
2010-10-25 0:08 ` [PATCHv5 20/23] git notes merge: Add testcases for merging notes trees at different fanouts Johan Herland
2010-10-29 15:01 ` Junio C Hamano
2010-11-01 0:09 ` Johan Herland [this message]
2010-10-25 0:08 ` [PATCHv5 21/23] Provide 'git notes get-ref' to easily retrieve current notes ref Johan Herland
2010-10-25 0:08 ` [PATCHv5 22/23] cmd_merge(): Parse options before checking MERGE_HEAD Johan Herland
2010-10-25 0:08 ` [PATCHv5 23/23] Provide 'git merge --abort' as a synonym to 'git reset --merge' Johan Herland
2010-10-25 1:32 ` Jonathan Nieder
2010-10-25 10:02 ` Johan Herland
2010-10-26 1:26 ` Johan Herland
2010-10-26 1:30 ` [PATCHv5.1 22/23] cmd_merge(): Parse options before checking MERGE_HEAD Johan Herland
2010-10-26 1:34 ` [PATCHv5.1 23/23] Provide 'git merge --abort' as a synonym to 'git reset --merge' Johan Herland
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=201011010109.38459.johan@herland.net \
--to=johan@herland$(echo .)net \
--cc=avarab@gmail$(echo .)com \
--cc=bebarino@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
--cc=jrnieder@gmail$(echo .)com \
--cc=srabbelier@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox