diff options
| author |  Denton Liu <liu.denton@gmail.com> | 2020-10-07 23:44:39 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2020-10-08 11:48:53 -0700 |
| commit | d047154e7b2ab9c7191b0d72484012085051d521 (patch) | |
| tree | 082a9319b05892eb0bce3e873f2fe39d8598d277 | |
| parent | Git 2.29-rc0 (diff) | |
| download | tgif-d047154e7b2ab9c7191b0d72484012085051d521.tar.xz | |
contrib/git-resurrect.sh: indent with tabs
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | contrib/git-resurrect.sh | 8 |
1 files 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 } 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 () { |