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

From: Junio C Hamano <gitster@pobox.com>
Date: Jan 22, 2015, 20:10 UTC
Message-ID: <xmqq3872tw4j.fsf@gitster.dls.corp.google.com>
In-Reply-To: <1421927415-114643-1-git-send-email-kirill.shutemov@linux.intel.com>

"Kirill A. Shutemov" <kirill.shutemov@linux.intel.com> writes:

Show 17 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.
>
> The patch change code to use full 40-hex revision ids for todo actions
> everywhere and collapse them only to show to user.
>
> Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
> ---
>  v3:
>     - use full 40-hex revision ids for todo actions everywhere and collapse them
>       only to show to user;

Show 8 quoted lines

> @@ -1054,6 +1052,7 @@ has_action "$todo" ||
>  	return 2
>  
>  cp "$todo" "$todo".backup
> +collapse_todo_ids
>  git_sequence_editor "$todo" ||
>  	die_abort "Could not execute editor"
>

OK, the matching expand_todo_ids is just beyond the horizon of this patch context.

I was hoping that with this change we internally operate with the full object names throughout the program, only to show shortened ones in the editor, but I still see a handful of "rev-parse --short" outside collapse_todo_ids. Upon closer inspection, it turns out that they are only about formatting "# Rebase a..b onto c", which is never rewritten in transform/collapse/expand_todo_ids, so I think all is well.

Thanks.

Show 16 quoted lines

> diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
> index 8197ed29a9ec..a31f7e0430e1 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 &&
> +	test 4 = $(grep -c "pick [0-9a-f]\{12,\}" todo-list)
> +'
> +
>  test_done