From: Matt Hoffman <matt.hoff...@quantumretail.com>
Changing underscores to dashes (push_all -> push-all)
Signed-off-by: Paul Campbell <pcampb...@kemitix.net>
Conflicts:
.gitignore
contrib/subtree/git-subtree.sh
---
contrib/subtree/git-subtree.sh | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/contrib/subtree/git-subtree.sh b/contrib/subtree/git-subtree.sh
index ddae56e..39d764b 100755
--- a/contrib/subtree/git-subtree.sh
+++ b/contrib/subtree/git-subtree.sh
@@ -12,7 +12,8 @@ git subtree add --prefix=<prefix> <commit>
git subtree add --prefix=<prefix> <repository> <commit>
git subtree merge --prefix=<prefix> <commit>
git subtree pull --prefix=<prefix> <repository> <refspec...>
-git subtree pull_all
+git subtree pull-all
+git subtree push-all
git subtree push --prefix=<prefix> <repository> <refspec...>
git subtree split --prefix=<prefix> <commit...>
git subtree from-submodule --prefix=<prefix>
@@ -103,18 +104,18 @@ done
command="$1"
shift
case "$command" in
- add|merge|pull|from-submodule|pull_all|push_all) default= ;;
+ add|merge|pull|from-submodule|pull-all|push-all) default= ;;
split|push) default="--default HEAD" ;;
*) die "Unknown command '$command'" ;;
esac
-if [ -z "$prefix" -a "$command" != "pull_all" -a "$command" != "push_all" ];
then
+if [ -z "$prefix" -a "$command" != "pull-all" -a "$command" != "push-all" ];
then
die "You must provide the --prefix option."
fi
case "$command" in
- pull_all);;
- push_all);;
+ pull-all);;
+ push-all);;
add) [ -e "$prefix" ] &&
die "prefix '$prefix' already exists." ;;
*) [ -e "$prefix" ] ||
@@ -123,7 +124,7 @@ esac
dir="$(dirname "$prefix/.")"
-if [ "$command" != "pull" -a "$command" != "add" -a "$command" != "push" -a
"$command" != "pull_all" ]; then
+if [ "$command" != "pull" -a "$command" != "add" -a "$command" != "push" -a
"$command" != "pull-all" ]; then
revs=$(git rev-parse $default --revs-only "$@") || exit $?
dirs="$(git rev-parse --no-revs --no-flags "$@")" || exit $?
if [ -n "$dirs" ]; then
@@ -770,7 +771,7 @@ cmd_from-submodule()
rm -rf $tmp_repo
}
-cmd_pull_all()
+cmd_pull-all()
{
git config -f .gittrees -l | grep subtree | grep path | grep -o '=.*' |
grep -o '[^=].*' |
while read path; do
@@ -778,7 +779,7 @@ cmd_pull_all()
done
}
-cmd_push_all()
+cmd_push-all()
{
git config -f .gittrees -l | grep subtree | grep path | grep -o '=.*' |
grep -o '[^=].*' |
while read path; do
--
1.8.2.rc1
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
