]> git.madduck.net Git - code/myrepos.git/commitdiff

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

projects / code / myrepos.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f11dccd)
Avoid using sed -r in git-fake-bare, for OSX portability.
authorJoey Hess <joey@kitenet.net>
Fri, 5 Aug 2011 17:29:42 +0000 (13:29 -0400)
committerJoey Hess <joey@kitenet.net>
Fri, 5 Aug 2011 17:29:42 +0000 (13:29 -0400)
debian/changelog patch | blob | history
lib/git-fake-bare patch | blob | history

diff --git a/debian/changelog b/debian/changelog
index 2ae9d4883293336a7279ff193956fd6b26a93c0c..bab20dbb2c6cb3a6d21dd49830dbe138f1916463 100644 (file)
--- 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 <joeyh@debian.org>  Fri, 05 Aug 2011 13:29:21 -0400
+
 mr (1.04) unstable; urgency=low
 
   * Improve trust errors displayed while bootstrapping. Closes: #628234
 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 b90304d42b9898341669f3a2f938351f72d98250..aec9b665f32f25b16390c32dac30f0d8368b006d 100644 (file)
--- a/lib/git-fake-bare
+++ b/lib/git-fake-bare
@@ -49,7 +49,7 @@ git_fake_bare_test =
 
 git_fake_bare_update =
        args="$@"
 
 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
 
        [ -z "$args" ] && args="-t origin $branch"
        GIT_DIR="$MR_REPO" git pull $args
 
hacking on myrepos

Legalese

All content available in this repository is copyright © martin f. krafft, unless otherwise noted.

All files and their content are released under the terms of the Artistic Licence 2.0, unless otherwise noted.

The operator of this repository shall not be held liable for offending content in pages linking to or linked from these page, nor does he endorse their content unless stated otherwise.