Re: [PATCH 1/2] contrib/git-resurrect.sh: indent with tabs
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Oct 8, 2020, 17:32 UTC
- Message-ID
- <xmqqa6wwy66x.fsf@gitster.c.googlers.com>
- In-Reply-To
- <5f5f1763043e80cbae6f9d4286aa5ba1960d32e0.1602139448.git.liu.denton@gmail.com>
Denton Liu <liu.denton@gmail.com> writes:
Show 19 quoted lines
> In the git-resurrect script, there are a few lines that are mistakenly
> indented with spaces. Replace these lines with tabs.
>
> Signed-off-by: Denton Liu <liu.denton@gmail.com>
> ---
> contrib/git-resurrect.sh | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/contrib/git-resurrect.sh b/contrib/git-resurrect.sh
> index 8c171dd959..57a77c03f9 100755
> --- a/contrib/git-resurrect.sh
> +++ b/contrib/git-resurrect.sh
> @@ -27,7 +27,7 @@ n,dry-run don't recreate the branch"
>
> search_reflog () {
> sed -ne 's~^\([^ ]*\) .* checkout: moving from '"$1"' .*~\1~p' \
> - < "$GIT_DIR"/logs/HEAD
> + < "$GIT_DIR"/logs/HEAD
> }Unless this is done in preparation for a more meaningful change (like not reading from on-disk logs/HEAD and instead reading from "git reflog" output in order to help our future migration to the reftable backend), I do not think the reviewers' time is worth it for cosmetic changes on this script.
Show 14 quoted lines
> search_reflog_merges () {
> @@ -41,9 +41,9 @@ _x40="[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f]"
> _x40="$_x40$_x40$_x40$_x40$_x40$_x40$_x40$_x40"
>
> search_merges () {
> - git rev-list --all --grep="Merge branch '$1'" \
> - --pretty=tformat:"%P %s" |
> - sed -ne "/^$_x40 \($_x40\) Merge .*/ {s//\1/p;$early_exit}"
> + git rev-list --all --grep="Merge branch '$1'" \
> + --pretty=tformat:"%P %s" |
> + sed -ne "/^$_x40 \($_x40\) Merge .*/ {s//\1/p;$early_exit}"
> }
>
> search_merge_targets () {