[milter-manager-commit] milter-manager/milter-manager at c5ec408 [master] Use git submodule instead of git clone into subdirectory

Back to archive index

Kenji Okimoto null+****@clear*****
Tue Dec 27 18:05:30 JST 2016


Kenji Okimoto	2016-12-27 18:05:30 +0900 (Tue, 27 Dec 2016)

  New Revision: c5ec40887dd3996742169994774048310ac58712
  https://github.com/milter-manager/milter-manager/commit/c5ec40887dd3996742169994774048310ac58712

  Message:
    Use git submodule instead of git clone into subdirectory

  Added files:
    .gitmodules
    binding/ruby/test-unit
    html/blog/clear-code
  Modified files:
    .gitignore
    autogen.sh

  Modified: .gitignore (+0 -2)
===================================================================
--- .gitignore    2016-12-27 17:20:20 +0900 (a6eb8b5)
+++ .gitignore    2016-12-27 18:05:30 +0900 (472cd2e)
@@ -25,7 +25,6 @@
 /binding/ruby/ruby-milter/milter/client.rb
 /binding/ruby/ruby-milter/milter/core.rb
 /binding/ruby/ruby-milter/milter/server.rb
-/binding/ruby/test-unit/
 /build
 /config
 /config.h
@@ -115,7 +114,6 @@
 /doc/reference/users.xml*
 /doc/reference/version.xml
 /doc/reference/xml/
-/html/blog/clear-code/
 /html/blog/data/ja/cache/
 /html/blog/data/ja/category/
 /html/blog/data/ja/log/

  Added: .gitmodules (+6 -0) 100644
===================================================================
--- /dev/null
+++ .gitmodules    2016-12-27 18:05:30 +0900 (01a7ace)
@@ -0,0 +1,6 @@
+[submodule "binding/ruby/test-unit"]
+	path = binding/ruby/test-unit
+	url = https://github.com/test-unit/test-unit.git
+[submodule "html/blog/clear-code"]
+	path = html/blog/clear-code
+	url = https://github.com/clear-code/tdiary.git

  Modified: autogen.sh (+1 -27)
===================================================================
--- autogen.sh    2016-12-27 17:20:20 +0900 (6eac220)
+++ autogen.sh    2016-12-27 18:05:30 +0900 (f7e9aae)
@@ -1,7 +1,5 @@
 #!/bin/sh
 
-update=yes
-
 run()
 {
     $@
@@ -11,37 +9,13 @@ run()
     fi
 }
 
-git_update()
-{
-    local repository="$1"
-    local dir="${2-`basename $repository`}"
-    if [ $update != yes -a -d "$dir" ]; then
-	return
-    fi
-    if test -d "$dir/.git"; then
-	(cd "$dir" && git pull --rebase)
-    else
-	rm -rf "$dir"
-	git clone "$repository" "$dir"
-    fi
-}
-
 # for old intltoolize
 if [ ! -d config/po ]; then
     mkdir -p config
     ln -s ../po config/po
 fi
 
-if [ x"$1" = x--no-update ]; then
-    shift
-    update=no
-fi
-
-clear_code_tdiary_repository=https://github.com/clear-code/tdiary
-run git_update ${clear_code_tdiary_repository} html/blog/clear-code
-
-test_unit_repository=https://github.com/test-unit/test-unit.git
-run git_update ${test_unit_repository} binding/ruby/test-unit
+git submodule update --init
 
 run ${ACLOCAL:-aclocal} $ACLOCAL_OPTIONS
 run ${LIBTOOLIZE:-libtoolize} --copy --force

  Added: binding/ruby/test-unit (+1 -0) 160000
===================================================================
--- /dev/null
+++ binding/ruby/test-unit    2016-12-27 18:05:30 +0900 (e921b50)
@@ -0,0 +1 @@
+Subproject commit e921b50b92277045ad1a5b8274a9b99b85a17eb6

  Added: html/blog/clear-code (+1 -0) 160000
===================================================================
--- /dev/null
+++ html/blog/clear-code    2016-12-27 18:05:30 +0900 (aadfe61)
@@ -0,0 +1 @@
+Subproject commit aadfe61b9c561ed81fd9ee8d9e54fe87d3131eb1
-------------- next part --------------
An HTML attachment was scrubbed...
下载 



More information about the milter-manager-commit mailing list
Back to archive index