summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-04-01 04:08:30 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-04-01 04:08:30 (GMT)
commitfba275dc93319ffa31ecebe015f8cda671fcf0e5 (patch)
tree8dc0c6f20e7e5eff7b30eb583fb2334301711dd7
parente1ff064e1bffedb917c491681b7bfd4d66633ef5 (diff)
downloadgit-fba275dc93319ffa31ecebe015f8cda671fcf0e5.zip
git-fba275dc93319ffa31ecebe015f8cda671fcf0e5.tar.gz
git-fba275dc93319ffa31ecebe015f8cda671fcf0e5.tar.bz2
contrib/git-resurrect.sh: do not write \t for HT in sed scripts
Just like we did in 0d1d6e50 ("t/t7003: replace \t with literal tab in sed expression", 2010-08-12), avoid writing "\t" for HT in sed scripts, which is not portable. Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xcontrib/git-resurrect.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/git-resurrect.sh b/contrib/git-resurrect.sh
index c364dda..3b78ffd 100755
--- a/contrib/git-resurrect.sh
+++ b/contrib/git-resurrect.sh
@@ -24,13 +24,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
)
}