From: Eric Sunshine <sunshine@sunshineco.com>
To: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>
Cc: Junio C Hamano <gitster@pobox.com>, Git List <git@vger.kernel.org>
Subject: Re: [PATCH] rebase -i: respect core.abbrev for real
Date: Mon, 19 Jan 2015 17:43:52 -0500 [thread overview]
Message-ID: <CAPig+cQcYXzRwHMRcKQJf-mWq7d9Kgp7KndnEhFs4_mwgLpiiA@mail.gmail.com> (raw)
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:
> 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.
> + test 4 = $(grep -c "pick [0-9a-f]\{12,\}" todo-list)
> +'
> +
> test_done
> --
> 2.1.4
next prev parent reply other threads:[~2015-01-19 22:43 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-19 14:20 [PATCH] rebase -i: respect core.abbrev for real Kirill A. Shutemov
2015-01-19 22:43 ` Eric Sunshine [this message]
2015-01-20 10:42 ` [PATCHv2] " Kirill A. Shutemov
2015-01-22 6:56 ` Junio C Hamano
2015-01-22 11:50 ` [PATCHv3] " Kirill A. Shutemov
2015-01-22 20:10 ` Junio C Hamano
2015-01-22 20:19 ` RFC "grep '...\{m,n\}"? Junio C Hamano
2015-01-23 0:39 ` Duy Nguyen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAPig+cQcYXzRwHMRcKQJf-mWq7d9Kgp7KndnEhFs4_mwgLpiiA@mail.gmail.com \
--to=sunshine@sunshineco.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=kirill.shutemov@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).