undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-rebase--interactive.sh: replace cut with ${v%% *}

Browse Source 
Some versions of cut do not cope well with lines that do not end in
an LF. In this case, we can completely avoid cut by using the
${var%% *} parameter expansion (suggested by Brandon Casey).

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

Signed-off-by: Chris Johnsen <chris_johnsen@pobox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Chris Johnsen 2010-09-17 16:42:51 -05:00 committed by Junio C Hamano
parent 84d694027f
commit 14d872987a
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
git-rebase--interactive.sh
View File

@ -626,7 +626,7 @@ skip_unnecessary_picks () {
case "$fd,$command" in case "$fd,$command" in
3,pick|3,p) 3,pick|3,p)
# pick a commit whose parent is current $ONTO -> skip # pick a commit whose parent is current $ONTO -> skip
sha1=$(printf '%s' "$rest" | cut -d ' ' -f 1) sha1=${rest%% *}
case "$(git rev-parse --verify --quiet "$sha1"^)" in case "$(git rev-parse --verify --quiet "$sha1"^)" in
"$ONTO"*) "$ONTO"*)
ONTO=$sha1 ONTO=$sha1