Johannes Schindelin <Johannes.Schindelin@xxxxxx> writes:
> Support "--verbose" in addition to "-v", show short names in the list
> comment, clean up if there is nothing to do, and add several "test_ticks"
> in the test script.
>
> Signed-off-by: Johannes Schindelin <johannes.schindelin@xxxxxx>
> ---
> git-rebase--interactive.sh | 19 +++++++++++++++----
> t/t3404-rebase-interactive.sh | 2 ++
> 2 files changed, 17 insertions(+), 4 deletions(-)
>
> diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
> index ab36572..b95fe86 100755
> --- a/git-rebase--interactive.sh
> +++ b/git-rebase--interactive.sh
> @@ -60,6 +60,11 @@ die_with_patch () {
> die "$2"
> }
>
> +die_abort () {
> + rm -rf "$DOTEST" 2> /dev/null
> + die "$1"
> +}
Why "2>/dev/null" here?
> @@ -264,8 +269,11 @@ do
> echo $ONTO > "$DOTEST"/onto
> test t = "$VERBOSE" && : > "$DOTEST"/verbose
>
> + SHORTUPSTREAM=$(git rev-parse --short $UPSTREAM)
> + SHORTHEAD=$(git rev-parse --short $HEAD)
> + SHORTONTO=$(git rev-parse --short $ONTO)
> cat > "$TODO" << EOF
> -# Rebasing $UPSTREAM..$HEAD onto $ONTO
> +# Rebasing $SHORTUPSTREAM)..$SHORTHEAD onto $SHORTONTO
What is this close-paren about? Is it a typo?
-
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
