On 09/17/2010 09:17 AM, Chris Johnsen wrote:
> Some versions of cut do not cope well with lines that do not end in
> an LF. Add '\n' to the printf format string to ensure that the
> generated output ends in a LF.
>
> I found this problem when t3404's "avoid unnecessary reset" failed
> due to the "rebase -i" not avoiding updating the tested timestamp.
>
> On a Mac OS X 10.4.11 system:
>
> % printf '%s' 'foo bar' | /usr/bin/cut -d ' ' -f 1
> cut: stdin: Illegal byte sequence
> % printf '%s\n' 'foo bar' | /usr/bin/cut -d ' ' -f 1
> foo
Or we could write it like:
sha1=${rest%% *}
which I wish I had changed it to in the first place when I made some
recent modifications. The '%%' notation avoids the whole newline issue
by not even spawning 'cut'. We are already using this construct in
git-filter-branch.sh and git-instaweb.sh, though those are not the
most visible scripts in git.
Does the above work on your FreeBSD system?
-Brandon
> Signed-off-by: Chris Johnsen <chris_johnsen@xxxxxxxxx>
>
> ---
> It looks like the cut on my system is derived from FreeBSD. It is
> probably an old version though (possibly too old to care about).
>
> The cut from GNU coreutils does not to have this problem, so using
> it serves as a workaround.
> ---
> git-rebase--interactive.sh | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
> index eb2dff5..834460a 100755
> --- a/git-rebase--interactive.sh
> +++ b/git-rebase--interactive.sh
> @@ -626,7 +626,7 @@ skip_unnecessary_picks () {
> case "$fd,$command" in
> 3,pick|3,p)
> # pick a commit whose parent is current $ONTO -> skip
> - sha1=$(printf '%s' "$rest" | cut -d ' ' -f 1)
> + sha1=$(printf '%s\n' "$rest" | cut -d ' ' -f 1)
> case "$(git rev-parse --verify --quiet "$sha1"^)" in
> "$ONTO"*)
> ONTO=$sha1
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html