From: Junio C Hamano Date: Mon, 17 Apr 2017 06:29:28 +0000 (-0700) Subject: Merge branch 'jc/bs-t-is-not-a-tab-for-sed' X-Git-Tag: v2.13.0-rc0~26 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/3c833cae446364872b759c7622af2760a2f81a11?hp=93a96cced3ff4181bde02b1688c15d5de03db7be Merge branch 'jc/bs-t-is-not-a-tab-for-sed' Code cleanup. * jc/bs-t-is-not-a-tab-for-sed: contrib/git-resurrect.sh: do not write \t for HT in sed scripts --- diff --git a/contrib/git-resurrect.sh b/contrib/git-resurrect.sh index d7e97bbc76..8c171dd959 100755 --- a/contrib/git-resurrect.sh +++ b/contrib/git-resurrect.sh @@ -26,13 +26,13 @@ n,dry-run don't recreate the branch" . git-sh-setup search_reflog () { - sed -ne 's~^\([^ ]*\) .*\tcheckout: moving from '"$1"' .*~\1~p' \ + sed -ne 's~^\([^ ]*\) .* checkout: moving from '"$1"' .*~\1~p' \ < "$GIT_DIR"/logs/HEAD } search_reflog_merges () { git rev-parse $( - sed -ne 's~^[^ ]* \([^ ]*\) .*\tmerge '"$1"':.*~\1^2~p' \ + sed -ne 's~^[^ ]* \([^ ]*\) .* merge '"$1"':.*~\1^2~p' \ < "$GIT_DIR"/logs/HEAD ) }