Merge branch 'feature/convert-slashes' into develop

varunkvv · Dec 1, 2011 · 72594ea · 72594ea
2 parents b4626cb + 083a588
commit 72594ea
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/Changes.mdown b/Changes.mdown
@@ -10,6 +10,8 @@ Release date: **not yet**
 
 * Various minor bug fixes related to internal argument passing
 
+* Better support for Windows users.
+
 * Add package installers for the Debian and Windows platforms.
 
 0.4.1:

diff --git a/git-flow b/git-flow
@@ -42,7 +42,9 @@ if [ "$DEBUG" = "yes" ]; then
 	set -x
 fi
 
-export GITFLOW_DIR=$(dirname "$0")
+# The sed expression here replaces all backslashes by forward slashes.
+# This helps our Windows users, while not bothering our Unix users.
+export GITFLOW_DIR=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
 
 usage() {
 	echo "usage: git flow <subcommand>"