From: SZEDER Gábor Date: Fri, 03 Oct 2008 09:33:20 GMT Subject: rebase -i: remove leftover debugging Message-ID: <20081003093320.GF6839@neumann> In-Reply-To: <20081003060110.GA4473@coredump.intra.peff.net> Signed-off-by: SZEDER Gábor --- On Fri, Oct 03, 2008 at 02:01:10AM -0400, Jeff King wrote: > Sorry, but "cp -v" is not portable. It's not in POSIX, and this breaks > the script for (at least) Solaris. > > However, it's not even clear to me why "-v" is used at all, considering > that the "squash" case above does not use it. Is it a debugging > leftover? Am I missing something? Oh, yeah, it's just leftover debugging. Thanks for catching. 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 77e1132..ec4299a 100755 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -322,7 +322,7 @@ do_next () { MSG_OPT= MSG_FILE= rm -f "$SQUASH_MSG" || exit - cp -v "$MSG" "$GIT_DIR"/SQUASH_MSG + cp "$MSG" "$GIT_DIR"/SQUASH_MSG rm -f "$GIT_DIR"/MERGE_MSG || exit ;; esac -- 1.6.0.2.430.gfc53