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
This commit is contained in:
@ -26,13 +26,13 @@ n,dry-run don't recreate the branch"
|
|||||||
. git-sh-setup
|
. git-sh-setup
|
||||||
|
|
||||||
search_reflog () {
|
search_reflog () {
|
||||||
sed -ne 's~^\([^ ]*\) .*\tcheckout: moving from '"$1"' .*~\1~p' \
|
sed -ne 's~^\([^ ]*\) .* checkout: moving from '"$1"' .*~\1~p' \
|
||||||
< "$GIT_DIR"/logs/HEAD
|
< "$GIT_DIR"/logs/HEAD
|
||||||
}
|
}
|
||||||
|
|
||||||
search_reflog_merges () {
|
search_reflog_merges () {
|
||||||
git rev-parse $(
|
git rev-parse $(
|
||||||
sed -ne 's~^[^ ]* \([^ ]*\) .*\tmerge '"$1"':.*~\1^2~p' \
|
sed -ne 's~^[^ ]* \([^ ]*\) .* merge '"$1"':.*~\1^2~p' \
|
||||||
< "$GIT_DIR"/logs/HEAD
|
< "$GIT_DIR"/logs/HEAD
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user