From: Junio C Hamano <gitster@pobox.com>
To: Denton Liu <liu.denton@gmail.com>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: [PATCH 1/2] contrib/git-resurrect.sh: indent with tabs
Date: Thu, 08 Oct 2020 11:48:44 -0700 [thread overview]
Message-ID: <xmqqsgaowo37.fsf@gitster.c.googlers.com> (raw)
In-Reply-To: <xmqqa6wwy66x.fsf@gitster.c.googlers.com> (Junio C. Hamano's message of "Thu, 08 Oct 2020 10:32:22 -0700")
Junio C Hamano <gitster@pobox.com> writes:
> Denton Liu <liu.denton@gmail.com> writes:
>
>> 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.
>
OK, so the "meaningful" part is to prepare for SHA-256 world. That
sort-of makes sense.
But don't we want to remove the SP after the redirection operator
on the same line, while we are looking at it?
>> 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 () {
next prev parent reply other threads:[~2020-10-08 18:48 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-08 6:44 [PATCH 0/2] contrib/git-resurrect.sh: make it hash-agnostic Denton Liu
2020-10-08 6:44 ` [PATCH 1/2] contrib/git-resurrect.sh: indent with tabs Denton Liu
2020-10-08 17:32 ` Junio C Hamano
2020-10-08 18:48 ` Junio C Hamano [this message]
2020-10-08 6:44 ` [PATCH 2/2] contrib/git-resurrect.sh: use hash-agnostic OID pattern Denton Liu
2020-10-08 16:13 ` Jeff King
2020-10-08 18:29 ` Junio C Hamano
2020-10-08 19:53 ` Jeff King
2020-10-08 22:11 ` brian m. carlson
2020-10-09 7:55 ` Andreas Schwab
2020-10-09 11:53 ` Jeff King
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqsgaowo37.fsf@gitster.c.googlers.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=liu.denton@gmail.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).