From 946d8d438bafdd34fb474d07598218032ea0497f Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 5 Aug 2011 13:29:42 -0400 Subject: [PATCH 1/1] Avoid using sed -r in git-fake-bare, for OSX portability. --- debian/changelog | 6 ++++++ lib/git-fake-bare | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 2ae9d48..bab20db 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +mr (1.05) UNRELEASED; urgency=low + + * Avoid using sed -r in git-fake-bare, for OSX portability. + + -- Joey Hess Fri, 05 Aug 2011 13:29:21 -0400 + mr (1.04) unstable; urgency=low * Improve trust errors displayed while bootstrapping. Closes: #628234 diff --git a/lib/git-fake-bare b/lib/git-fake-bare index b90304d..aec9b66 100644 --- a/lib/git-fake-bare +++ b/lib/git-fake-bare @@ -49,7 +49,7 @@ git_fake_bare_test = git_fake_bare_update = args="$@" - branch="$(GIT_DIR="$MR_REPO" git symbolic-ref HEAD | sed -re 's,.+/,,')" + branch="$(GIT_DIR="$MR_REPO" git symbolic-ref HEAD | sed -e 's,.*/,,')" [ -z "$args" ] && args="-t origin $branch" GIT_DIR="$MR_REPO" git pull $args -- 2.39.5