Re: [PATCH] rebase -i: respect core.abbrev for real

From: Eric Sunshine <sunshine@sunshineco.com>
Date: Jan 19, 2015, 22:43 UTC
Message-ID: <CAPig+cQcYXzRwHMRcKQJf-mWq7d9Kgp7KndnEhFs4_mwgLpiiA@mail.gmail.com>
In-Reply-To: <1421677248-137853-1-git-send-email-kirill.shutemov@linux.intel.com>

On Mon, Jan 19, 2015 at 9:20 AM, Kirill A. Shutemov <kirill.shutemov@linux.intel.com> wrote:

Show 23 quoted lines

> I have tried to fix this before: see 568950388be2, but it doesn't
> really work.
>
> I don't know how it happend, but that commit makes interactive rebase to
> respect core.abbrev only during --edit-todo, but not the initial todo
> list edit.
>
> For this time I've included a test-case to avoid this frustration again.
>
> Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
> ---
> diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
> index 8197ed29a9ec..a8ffc24ce46b 100755
> --- a/t/t3404-rebase-interactive.sh
> +++ b/t/t3404-rebase-interactive.sh
> @@ -1039,4 +1039,11 @@ test_expect_success 'short SHA-1 collide' '
>         )
>  '
>
> +test_expect_success 'respect core.abbrev' '
> +       git config core.abbrev 12 &&
> +       set_cat_todo_editor &&
> +       test_must_fail git rebase -i HEAD~4 >todo-list 2>&1

Broken &&-chain.

Show 6 quoted lines

> +       test 4 = $(grep -c "pick [0-9a-f]\{12,\}" todo-list)
> +'
> +
>  test_done
> --
> 2.1.4