diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-04-16 23:29:28 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-04-16 23:29:29 -0700 |
| commit | 3c833cae446364872b759c7622af2760a2f81a11 (patch) | |
| tree | c088aaab25517dae19010fc6e94807407033447e /contrib | |
| parent | 93a96cced3ff4181bde02b1688c15d5de03db7be (diff) | |
| parent | fba275dc93319ffa31ecebe015f8cda671fcf0e5 (diff) | |
| download | git-3c833cae446364872b759c7622af2760a2f81a11.tar.gz | |
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
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/git-resurrect.sh | 4 |
1 files changed, 2 insertions, 2 deletions
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 ) } |