Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'jc/bs-t-is-not-a-tab-for-sed'
author
Junio C Hamano
<gitster@pobox.com>
Mon, 17 Apr 2017 06:29:28 +0000
(23:29 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Mon, 17 Apr 2017 06:29:29 +0000
(23:29 -0700)
Code cleanup.
* jc/bs-t-is-not-a-tab-for-sed:
contrib/git-resurrect.sh: do not write \t for HT in sed scripts
contrib/git-resurrect.sh
patch
|
blob
|
history
raw
(from parent 1:
93a96cc
)
diff --git
a/contrib/git-resurrect.sh
b/contrib/git-resurrect.sh
index d7e97bbc76c27f61e83a5328831fd6889b22e662..8c171dd959f69501706c565218665ef474252d43 100755
(executable)
--- 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~^\([^ ]*\) .*\t
checkout: 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~^[^ ]* \([^ ]*\) .*
\t
merge '"$1"':.*~\1^2~p' \
+ sed -ne 's~^[^ ]* \([^ ]*\) .*
merge '"$1"':.*~\1^2~p' \
< "$GIT_DIR"/logs/HEAD
)
}