eac_git 0.1.0 → 0.3.3

Sign up to get free protection for your applications and to get access to all the features.
Files changed (192) hide show
  1. checksums.yaml +4 -4
  2. data/lib/eac_git/executables.rb +24 -4
  3. data/lib/eac_git/local.rb +5 -1
  4. data/lib/eac_git/local/dirty_files.rb +37 -0
  5. data/lib/eac_git/rspec.rb +17 -0
  6. data/lib/eac_git/version.rb +1 -1
  7. data/vendor/git-subrepo/Changes +110 -0
  8. data/vendor/git-subrepo/Intro.pod +509 -0
  9. data/vendor/git-subrepo/License +21 -0
  10. data/vendor/git-subrepo/Makefile +82 -0
  11. data/vendor/git-subrepo/Meta +28 -0
  12. data/vendor/git-subrepo/ReadMe.pod +698 -0
  13. data/vendor/git-subrepo/doc/comparison.swim +35 -0
  14. data/vendor/git-subrepo/doc/git-subrepo.swim +608 -0
  15. data/vendor/git-subrepo/doc/intro-to-subrepo.swim +387 -0
  16. data/vendor/git-subrepo/ext/bashplus/Changes +15 -0
  17. data/vendor/git-subrepo/ext/bashplus/License +21 -0
  18. data/vendor/git-subrepo/ext/bashplus/Makefile +45 -0
  19. data/vendor/git-subrepo/ext/bashplus/Meta +28 -0
  20. data/vendor/git-subrepo/ext/bashplus/ReadMe.pod +77 -0
  21. data/vendor/git-subrepo/ext/bashplus/bin/bash+ +43 -0
  22. data/vendor/git-subrepo/ext/bashplus/doc/bash+.swim +61 -0
  23. data/vendor/git-subrepo/ext/bashplus/lib/bash+.bash +92 -0
  24. data/vendor/git-subrepo/ext/bashplus/man/man1/bash+.1 +134 -0
  25. data/vendor/git-subrepo/ext/bashplus/man/man3/bash+.3 +134 -0
  26. data/vendor/git-subrepo/ext/bashplus/test/base.t +12 -0
  27. data/vendor/git-subrepo/ext/bashplus/test/fcopy.t +22 -0
  28. data/vendor/git-subrepo/ext/bashplus/test/lib/foo/bar.bash +3 -0
  29. data/vendor/git-subrepo/ext/bashplus/test/lib/foo/foo.bash +3 -0
  30. data/vendor/git-subrepo/ext/bashplus/test/source-bash+-std.t +18 -0
  31. data/vendor/git-subrepo/ext/bashplus/test/source-bash+.t +23 -0
  32. data/vendor/git-subrepo/ext/bashplus/test/test.bash +70 -0
  33. data/vendor/git-subrepo/ext/bashplus/test/use.t +19 -0
  34. data/vendor/git-subrepo/ext/test-more-bash/Changes +15 -0
  35. data/vendor/git-subrepo/ext/test-more-bash/License +21 -0
  36. data/vendor/git-subrepo/ext/test-more-bash/Makefile +20 -0
  37. data/vendor/git-subrepo/ext/test-more-bash/Meta +30 -0
  38. data/vendor/git-subrepo/ext/test-more-bash/ReadMe.pod +115 -0
  39. data/vendor/git-subrepo/ext/test-more-bash/doc/test-more.swim +89 -0
  40. data/vendor/git-subrepo/ext/test-more-bash/ext/bashplus/Changes +15 -0
  41. data/vendor/git-subrepo/ext/test-more-bash/ext/bashplus/License +21 -0
  42. data/vendor/git-subrepo/ext/test-more-bash/ext/bashplus/Makefile +45 -0
  43. data/vendor/git-subrepo/ext/test-more-bash/ext/bashplus/Meta +28 -0
  44. data/vendor/git-subrepo/ext/test-more-bash/ext/bashplus/ReadMe.pod +77 -0
  45. data/vendor/git-subrepo/ext/test-more-bash/ext/bashplus/bin/bash+ +43 -0
  46. data/vendor/git-subrepo/ext/test-more-bash/ext/bashplus/doc/bash+.swim +61 -0
  47. data/vendor/git-subrepo/ext/test-more-bash/ext/bashplus/lib/bash+.bash +92 -0
  48. data/vendor/git-subrepo/ext/test-more-bash/ext/bashplus/man/man1/bash+.1 +134 -0
  49. data/vendor/git-subrepo/ext/test-more-bash/ext/bashplus/man/man3/bash+.3 +134 -0
  50. data/vendor/git-subrepo/ext/test-more-bash/ext/bashplus/test/base.t +12 -0
  51. data/vendor/git-subrepo/ext/test-more-bash/ext/bashplus/test/fcopy.t +22 -0
  52. data/vendor/git-subrepo/ext/test-more-bash/ext/bashplus/test/lib/foo/bar.bash +3 -0
  53. data/vendor/git-subrepo/ext/test-more-bash/ext/bashplus/test/lib/foo/foo.bash +3 -0
  54. data/vendor/git-subrepo/ext/test-more-bash/ext/bashplus/test/source-bash+-std.t +18 -0
  55. data/vendor/git-subrepo/ext/test-more-bash/ext/bashplus/test/source-bash+.t +23 -0
  56. data/vendor/git-subrepo/ext/test-more-bash/ext/bashplus/test/test.bash +70 -0
  57. data/vendor/git-subrepo/ext/test-more-bash/ext/bashplus/test/use.t +19 -0
  58. data/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/Changes +15 -0
  59. data/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/License +21 -0
  60. data/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/Makefile +37 -0
  61. data/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/Meta +28 -0
  62. data/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/ReadMe.pod +66 -0
  63. data/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/doc/test-tap.swim +48 -0
  64. data/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/lib/test/tap.bash +153 -0
  65. data/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/man/man3/test-tap.3 +119 -0
  66. data/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/test/bail_out.t +13 -0
  67. data/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/test/done.t +10 -0
  68. data/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/test/fail.t +20 -0
  69. data/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/test/fail_fast.t +15 -0
  70. data/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/test/helper.bash +9 -0
  71. data/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/test/pass.t +9 -0
  72. data/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/test/plan.t +10 -0
  73. data/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/test/skip_all.t +20 -0
  74. data/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/test/tap.t +13 -0
  75. data/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/test/test/bail.t +14 -0
  76. data/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/test/test/fail.t +7 -0
  77. data/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/test/test/fail_fast.t +12 -0
  78. data/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/test/test/skip-all-init.t +8 -0
  79. data/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/test/test/skip-all-plan.t +9 -0
  80. data/vendor/git-subrepo/ext/test-more-bash/lib/test/more.bash +95 -0
  81. data/vendor/git-subrepo/ext/test-more-bash/man/man3/test-more.3 +173 -0
  82. data/vendor/git-subrepo/ext/test-more-bash/test/fail.t +20 -0
  83. data/vendor/git-subrepo/ext/test-more-bash/test/more.t +20 -0
  84. data/vendor/git-subrepo/ext/test-more-bash/test/pass.t +9 -0
  85. data/vendor/git-subrepo/ext/test-more-bash/test/setup +8 -0
  86. data/vendor/git-subrepo/ext/test-more-bash/test/skip_all.t +11 -0
  87. data/vendor/git-subrepo/ext/test-more-bash/test/test/fail1.t +12 -0
  88. data/vendor/git-subrepo/ext/test-more-bash/test/test/skip_all.t +10 -0
  89. data/vendor/git-subrepo/lib/git-subrepo +1903 -0
  90. data/vendor/git-subrepo/lib/git-subrepo.d/bash+.bash +1 -0
  91. data/vendor/git-subrepo/lib/git-subrepo.d/help-functions.bash +339 -0
  92. data/vendor/git-subrepo/man/man1/git-subrepo.1 +743 -0
  93. data/vendor/git-subrepo/note/0.4.0 +12 -0
  94. data/vendor/git-subrepo/note/AllGitCmds +148 -0
  95. data/vendor/git-subrepo/note/Cases +32 -0
  96. data/vendor/git-subrepo/note/Commands +33 -0
  97. data/vendor/git-subrepo/note/Dags +199 -0
  98. data/vendor/git-subrepo/note/Gists +7 -0
  99. data/vendor/git-subrepo/note/Links +25 -0
  100. data/vendor/git-subrepo/note/Plugins +10 -0
  101. data/vendor/git-subrepo/note/Spec +39 -0
  102. data/vendor/git-subrepo/note/Story1 +57 -0
  103. data/vendor/git-subrepo/note/ToDo +55 -0
  104. data/vendor/git-subrepo/note/design.swim +137 -0
  105. data/vendor/git-subrepo/note/design2.swim +85 -0
  106. data/vendor/git-subrepo/note/init-test +38 -0
  107. data/vendor/git-subrepo/note/pull-dance.txt +18 -0
  108. data/vendor/git-subrepo/note/recreate-rebase-conflict.sh +56 -0
  109. data/vendor/git-subrepo/note/subtree-rebase-fail-example/test.bash +29 -0
  110. data/vendor/git-subrepo/note/test-subrepo-push.sh +69 -0
  111. data/vendor/git-subrepo/note/test.sh +58 -0
  112. data/vendor/git-subrepo/pkg/bin/generate-completion.pl +210 -0
  113. data/vendor/git-subrepo/pkg/bin/generate-help-functions.pl +89 -0
  114. data/vendor/git-subrepo/share/completion.bash +42 -0
  115. data/vendor/git-subrepo/share/enable-completion.sh +50 -0
  116. data/vendor/git-subrepo/share/git-completion.bash +2738 -0
  117. data/vendor/git-subrepo/share/zsh-completion/_git-subrepo +81 -0
  118. data/vendor/git-subrepo/test/branch-all.t +41 -0
  119. data/vendor/git-subrepo/test/branch-rev-list-one-path.t +43 -0
  120. data/vendor/git-subrepo/test/branch-rev-list.t +47 -0
  121. data/vendor/git-subrepo/test/branch.t +52 -0
  122. data/vendor/git-subrepo/test/clean.t +43 -0
  123. data/vendor/git-subrepo/test/clone-annotated-tag.t +45 -0
  124. data/vendor/git-subrepo/test/clone.t +107 -0
  125. data/vendor/git-subrepo/test/compile.t +19 -0
  126. data/vendor/git-subrepo/test/config.t +58 -0
  127. data/vendor/git-subrepo/test/encode.t +91 -0
  128. data/vendor/git-subrepo/test/error.t +171 -0
  129. data/vendor/git-subrepo/test/fetch.t +43 -0
  130. data/vendor/git-subrepo/test/gitignore.t +61 -0
  131. data/vendor/git-subrepo/test/init.t +64 -0
  132. data/vendor/git-subrepo/test/issue29.t +98 -0
  133. data/vendor/git-subrepo/test/issue95.t +98 -0
  134. data/vendor/git-subrepo/test/issue96.t +96 -0
  135. data/vendor/git-subrepo/test/pull-all.t +38 -0
  136. data/vendor/git-subrepo/test/pull-merge.t +113 -0
  137. data/vendor/git-subrepo/test/pull-message.t +88 -0
  138. data/vendor/git-subrepo/test/pull-new-branch.t +58 -0
  139. data/vendor/git-subrepo/test/pull-ours.t +90 -0
  140. data/vendor/git-subrepo/test/pull-theirs.t +82 -0
  141. data/vendor/git-subrepo/test/pull-twice.t +44 -0
  142. data/vendor/git-subrepo/test/pull-worktree.t +40 -0
  143. data/vendor/git-subrepo/test/pull.t +99 -0
  144. data/vendor/git-subrepo/test/push-after-init.t +51 -0
  145. data/vendor/git-subrepo/test/push-force.t +56 -0
  146. data/vendor/git-subrepo/test/push-new-branch.t +61 -0
  147. data/vendor/git-subrepo/test/push-no-changes.t +29 -0
  148. data/vendor/git-subrepo/test/push-squash.t +56 -0
  149. data/vendor/git-subrepo/test/push.t +176 -0
  150. data/vendor/git-subrepo/test/reclone.t +45 -0
  151. data/vendor/git-subrepo/test/repo/bar/HEAD +1 -0
  152. data/vendor/git-subrepo/test/repo/bar/config +4 -0
  153. data/vendor/git-subrepo/test/repo/bar/objects/1f/0c4b264caed0126814a0ede851a1e0b4e16ae6 +0 -0
  154. data/vendor/git-subrepo/test/repo/bar/objects/87/46903fdb1b9c2101377880125917c2e05b4d69 +0 -0
  155. data/vendor/git-subrepo/test/repo/bar/objects/94/c86ffc745232d89f78c6f895e11e71272518db +0 -0
  156. data/vendor/git-subrepo/test/repo/bar/objects/c6/76c57b6576743fa56278527aa60ebd2e202a7c +0 -0
  157. data/vendor/git-subrepo/test/repo/bar/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 +0 -0
  158. data/vendor/git-subrepo/test/repo/bar/objects/f6/2a8ff3feadf39b0a98f1a86ec6d1eb33858ee9 +0 -0
  159. data/vendor/git-subrepo/test/repo/bar/refs/heads/master +1 -0
  160. data/vendor/git-subrepo/test/repo/bar/refs/tags/A +1 -0
  161. data/vendor/git-subrepo/test/repo/foo/HEAD +1 -0
  162. data/vendor/git-subrepo/test/repo/foo/config +4 -0
  163. data/vendor/git-subrepo/test/repo/foo/objects/a0/f4cdaaf533a936296cdebbed8206c3b9ededa8 +0 -0
  164. data/vendor/git-subrepo/test/repo/foo/objects/e2/1291a1ad392a9d4c51dd9586804f1467b28afd +0 -0
  165. data/vendor/git-subrepo/test/repo/foo/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 +0 -0
  166. data/vendor/git-subrepo/test/repo/foo/refs/heads/master +1 -0
  167. data/vendor/git-subrepo/test/repo/init/HEAD +1 -0
  168. data/vendor/git-subrepo/test/repo/init/config +5 -0
  169. data/vendor/git-subrepo/test/repo/init/objects/11/523f5dcf03b4c89b592dc8a3d0308f68da2386 +0 -0
  170. data/vendor/git-subrepo/test/repo/init/objects/14/2addf8ec5f37334e837440122c62f2c68a29ad +0 -0
  171. data/vendor/git-subrepo/test/repo/init/objects/32/5180321750a21cd7a4e7ecda319e557a4f6a09 +2 -0
  172. data/vendor/git-subrepo/test/repo/init/objects/3d/918c6901c02f43af5d31779dd5e1f9166aeb36 +0 -0
  173. data/vendor/git-subrepo/test/repo/init/objects/3e/4cb596066dce63ba4d047abddb677389b65e19 +0 -0
  174. data/vendor/git-subrepo/test/repo/init/objects/4b/6e53022e7a04f07887697e4f3d7c377fd9822b +0 -0
  175. data/vendor/git-subrepo/test/repo/init/objects/58/931fc1bd559b59c41ea738fc7ad04f9ad01bd3 +0 -0
  176. data/vendor/git-subrepo/test/repo/init/objects/5e/c0c28e1b806f25efdca18fcf7a74b49c3755bd +0 -0
  177. data/vendor/git-subrepo/test/repo/init/objects/75/fa6584e748f57eff06eebdc55e9ac21d4fcbf2 +1 -0
  178. data/vendor/git-subrepo/test/repo/init/objects/80/2d5edbd5e1cb7fca82b5bd38e7c8a0a496fb20 +0 -0
  179. data/vendor/git-subrepo/test/repo/init/objects/94/7b3d714c38791e95ad6f928b48c98bb8708acd +0 -0
  180. data/vendor/git-subrepo/test/repo/init/objects/95/e1f2df3f4d5f3d7a60588c25a7ca8a913d3c2a +1 -0
  181. data/vendor/git-subrepo/test/repo/init/objects/b1/5f4a7666baf40d949548ead946a3370e273479 +0 -0
  182. data/vendor/git-subrepo/test/repo/init/objects/c3/ee8978c4c5d84c3b7d00ba8e5906933d027882 +0 -0
  183. data/vendor/git-subrepo/test/repo/init/objects/c8/b0bffbc405ef3fad7354ff833fbec36d67ddfa +3 -0
  184. data/vendor/git-subrepo/test/repo/init/objects/dd/8bdb934ec848137f011fe423b185505c343626 +2 -0
  185. data/vendor/git-subrepo/test/repo/init/objects/e2/9be58c767cfeb27235c995d293a7d71aac0135 +2 -0
  186. data/vendor/git-subrepo/test/repo/init/objects/ee/1224401fc6aac595145fa727dcf6706ac8aec1 +1 -0
  187. data/vendor/git-subrepo/test/repo/init/objects/f1/cc1a657b2e805c400f5dcaaa76bd29c6178b1b +0 -0
  188. data/vendor/git-subrepo/test/repo/init/refs/heads/master +1 -0
  189. data/vendor/git-subrepo/test/setup +205 -0
  190. data/vendor/git-subrepo/test/status.t +68 -0
  191. data/vendor/git-subrepo/test/submodule.t +45 -0
  192. metadata +190 -4
@@ -0,0 +1,81 @@
1
+ #compdef git-subrepo -P git\ ##subrepo
2
+ #description perform git-subrepo operations
3
+
4
+ # DO NOT EDIT. This file generated by pkg/bin/generate-completion.pl.
5
+
6
+ if [[ -z $GIT_SUBREPO_ROOT ]]; then
7
+ echo 'GIT_SUBREPO_ROOT is null; has `/path/to/git-subrepo/.rc` been sourced?'
8
+ return 3
9
+ fi
10
+
11
+ _git-subrepo() {
12
+ typeset -A opt_args
13
+ local curcontext="$curcontext" state line context
14
+
15
+ _arguments -s \
16
+ '1: :->subcmd' \
17
+ '*: :->args' \
18
+ '-h[Show the command summary]' \
19
+ '--help[Help overview]' \
20
+ '--version[Print the git-subrepo version number]' \
21
+ '(-a --all)'{-a,--all}'[Perform command on all current subrepos]' \
22
+ '(-A --ALL)'{-A,--ALL}'[Perform command on all subrepos and subsubrepos]' \
23
+ '(-b --branch)'{-b,--branch}'[Specify the upstream branch to push/pull/fetch]:b' \
24
+ '(-e --edit)'{-e,--edit}'[Edit commit message]' \
25
+ '(-f --force)'{-f,--force}'[Force certain operations]' \
26
+ '(-F --fetch)'{-F,--fetch}'[Fetch the upstream content first]' \
27
+ '(-M --method)'{-M,--method}'[Method when you join, valid options are '"'"'merge'"'"' or '"'"'rebase'"'"']:M' \
28
+ '--Default[is '"'"'merge'"'"']' \
29
+ '(-m --message)'{-m,--message}'[Specify a commit message]:m' \
30
+ '(-r --remote)'{-r,--remote}'[Specify the upstream remote to push/pull/fetch]:r' \
31
+ '(-s --squash)'{-s,--squash}'[Squash commits on push]' \
32
+ '(-u --update)'{-u,--update}'[Add the --branch and/or --remote overrides to .gitrepo]' \
33
+ '(-q --quiet)'{-q,--quiet}'[Show minimal output]' \
34
+ '(-v --verbose)'{-v,--verbose}'[Show verbose output]' \
35
+ '(-d --debug)'{-d,--debug}'[Show the actual commands used]' \
36
+ '(-x --DEBUG)'{-x,--DEBUG}'[Turn on -x Bash debugging]' \
37
+ && ret=0
38
+
39
+ case $state in
40
+ subcmd)
41
+ compadd branch clean clone commit config fetch help init pull push status upgrade version
42
+ ;;
43
+
44
+ args)
45
+ case $line[1] in
46
+
47
+ clone)
48
+ _arguments -C \
49
+ '1: :->subcmd' \
50
+ '2: :->repo' \
51
+ '*: :->subdir' \
52
+ && ret=0
53
+ case $state in
54
+ subdir|repo)
55
+ _files
56
+ ;;
57
+ esac
58
+ ;;
59
+
60
+ branch|clean|commit|config|fetch|pull|push|status)
61
+ _compadd_subdirs
62
+ ;;
63
+
64
+ init)
65
+ _files
66
+ ;;
67
+
68
+ help)
69
+ compadd branch clean clone commit config fetch help init pull push status upgrade version
70
+ ;;
71
+ esac
72
+ ;;
73
+ esac
74
+
75
+ }
76
+
77
+ _compadd_subdirs() {
78
+ local subrepos
79
+ IFS=$'\n' set -A subrepos `git subrepo status -q`
80
+ compadd -X "subrepos: " $subrepos
81
+ }
@@ -0,0 +1,41 @@
1
+ #!/usr/bin/env bash
2
+
3
+ set -e
4
+
5
+ source test/setup
6
+
7
+ use Test::More
8
+
9
+ note "Test commands work using --all flag"
10
+
11
+ clone-foo-and-bar
12
+
13
+ (
14
+ cd $OWNER/foo
15
+ git subrepo clone --quiet ../../../$UPSTREAM/bar one
16
+ git subrepo clone --quiet ../../../$UPSTREAM/bar two
17
+ add-new-files two/file
18
+ )
19
+
20
+ ok "$(
21
+ cd $OWNER/foo
22
+ git subrepo branch --all &> /dev/null
23
+ )" "branch command works with --all even when a subrepo has no new commits"
24
+
25
+ ok "$(
26
+ cd $OWNER/foo
27
+ git:branch-exists subrepo/two
28
+ )" "The 'subrepo/two' branch exists"
29
+
30
+ test-exists "$OWNER/foo/.git/tmp/subrepo/two/"
31
+
32
+ ok "$(
33
+ cd $OWNER/foo
34
+ git:branch-exists subrepo/one
35
+ )" "The 'subrepo/one' branch exists"
36
+
37
+ test-exists "$OWNER/foo/.git/tmp/subrepo/one/"
38
+
39
+ done_testing
40
+
41
+ teardown
@@ -0,0 +1,43 @@
1
+ #!/usr/bin/env bash
2
+
3
+ set -e
4
+
5
+ source test/setup
6
+
7
+ use Test::More
8
+
9
+ clone-foo-and-bar
10
+
11
+ subrepo-clone-bar-into-foo
12
+
13
+ (
14
+ cd $OWNER/foo
15
+ branchpoint=$(git rev-parse HEAD)
16
+ add-new-files bar/file1
17
+ add-new-files bar/file2
18
+ git checkout -b other $branchpoint
19
+ add-new-files bar/file3
20
+ add-new-files bar/file4
21
+ add-new-files bar/file5
22
+ git merge master
23
+ ) >& /dev/null || die
24
+
25
+ test-exists "$OWNER/foo/bar/file1" "$OWNER/foo/bar/file2" "$OWNER/foo/bar/file3" "$OWNER/foo/bar/file4" "$OWNER/foo/bar/file5"
26
+
27
+ is "$(
28
+ cd $OWNER/foo
29
+ git subrepo branch bar
30
+ )" \
31
+ "Created branch 'subrepo/bar' and worktree '.git/tmp/subrepo/bar'." \
32
+ "subrepo branch command output is correct"
33
+
34
+ is $(
35
+ cd $OWNER/foo
36
+ git rev-list subrepo/bar | wc -l
37
+ ) \
38
+ 6 \
39
+ "We have only created commits for one of the paths"
40
+
41
+ done_testing
42
+
43
+ teardown
@@ -0,0 +1,47 @@
1
+ #!/usr/bin/env bash
2
+
3
+ set -e
4
+
5
+ source test/setup
6
+
7
+ use Test::More
8
+
9
+ clone-foo-and-bar
10
+
11
+ subrepo-clone-bar-into-foo
12
+
13
+ (
14
+ cd $OWNER/foo
15
+ branchpoint=$(git rev-parse HEAD)
16
+ add-new-files bar/file1
17
+ # We push here to force subrepo to handle
18
+ # histories where it's not first parent
19
+ git subrepo push bar
20
+ add-new-files bar/file2
21
+ git checkout -b other $branchpoint
22
+ add-new-files bar/file3
23
+ add-new-files bar/file4
24
+ add-new-files bar/file5
25
+ git merge master
26
+ ) >& /dev/null || die
27
+
28
+ test-exists "$OWNER/foo/bar/file1" "$OWNER/foo/bar/file2" "$OWNER/foo/bar/file3" "$OWNER/foo/bar/file4" "$OWNER/foo/bar/file5"
29
+
30
+ # -F is needed for branch to fetch new information
31
+ is "$(
32
+ cd $OWNER/foo
33
+ git subrepo -F branch bar
34
+ )" \
35
+ "Created branch 'subrepo/bar' and worktree '.git/tmp/subrepo/bar'." \
36
+ "subrepo branch command output is correct"
37
+
38
+ is $(
39
+ cd $OWNER/foo
40
+ git rev-list subrepo/bar | wc -l
41
+ ) \
42
+ 5 \
43
+ "We have only created commits for one of the paths"
44
+
45
+ done_testing
46
+
47
+ teardown
@@ -0,0 +1,52 @@
1
+ #!/usr/bin/env bash
2
+
3
+ set -e
4
+
5
+ source test/setup
6
+
7
+ use Test::More
8
+
9
+ clone-foo-and-bar
10
+
11
+ subrepo-clone-bar-into-foo
12
+
13
+ before="$(date -r $OWNER/foo/Foo '+%s')"
14
+
15
+ (
16
+ cd $OWNER/foo
17
+ add-new-files bar/file
18
+ add-new-files .gitrepo
19
+ )
20
+
21
+ save-original-state $OWNER/foo bar
22
+
23
+ # Make sure that time stamps differ
24
+ sleep 1
25
+
26
+ is "$(
27
+ cd $OWNER/foo
28
+ git subrepo branch bar
29
+ )" \
30
+ "Created branch 'subrepo/bar' and worktree '.git/tmp/subrepo/bar'." \
31
+ "subrepo branch command output is correct"
32
+
33
+
34
+ after="$(date -r $OWNER/foo/Foo '+%s')"
35
+ assert-original-state $OWNER/foo bar
36
+
37
+ # Check that we haven't checked out any temporary files
38
+ is "$before" "$after" \
39
+ "No modification on Foo"
40
+
41
+ test-exists "$OWNER/foo/.git/tmp/subrepo/bar/"
42
+
43
+ is "$(
44
+ cd $OWNER/foo/.git/tmp/subrepo/bar
45
+ git branch | grep \*
46
+ )" \
47
+ "* subrepo/bar" \
48
+ "Correct branch is checked out"
49
+
50
+ done_testing
51
+
52
+ teardown
@@ -0,0 +1,43 @@
1
+ #!/usr/bin/env bash
2
+
3
+ set -e
4
+
5
+ source test/setup
6
+
7
+ use Test::More
8
+
9
+ clone-foo-and-bar
10
+
11
+ subrepo-clone-bar-into-foo
12
+
13
+ (
14
+ cd $OWNER/foo
15
+ add-new-files bar/file
16
+ git subrepo --quiet branch bar
17
+ )
18
+
19
+ test-exists \
20
+ "$OWNER/foo/.git/refs/heads/subrepo/bar" \
21
+ "$OWNER/foo/.git/refs/subrepo/bar/fetch"
22
+
23
+ is "$(
24
+ cd $OWNER/foo
25
+ git subrepo clean bar
26
+ )" \
27
+ "Removed branch 'subrepo/bar'." \
28
+ "subrepo clean command output is correct"
29
+
30
+ test-exists \
31
+ "!$OWNER/foo/.git/refs/heads/subrepo/bar"
32
+
33
+ (
34
+ cd $OWNER/foo
35
+ git subrepo clean --force bar
36
+ )
37
+
38
+ test-exists \
39
+ "!$OWNER/foo/.git/refs/subrepo/bar/fetch"
40
+
41
+ done_testing
42
+
43
+ teardown
@@ -0,0 +1,45 @@
1
+ #!/usr/bin/env bash
2
+
3
+ set -e
4
+
5
+ source test/setup
6
+
7
+ use Test::More
8
+
9
+ clone-foo-and-bar
10
+
11
+ (
12
+ cd $OWNER/bar
13
+ git tag -a annotated_tag -m "My annotated tag"
14
+ git tag lightweight_tag
15
+ ) # >& /dev/null || die
16
+
17
+ # Do the subrepo clone with tag and test the output:
18
+ {
19
+ clone_output="$(
20
+ cd $OWNER/foo
21
+ git subrepo clone ../bar/.git -b lightweight_tag light
22
+ )"
23
+
24
+ # Check output is correct:
25
+ is "$clone_output" \
26
+ "Subrepo '../bar/.git' (lightweight_tag) cloned into 'light'." \
27
+ 'subrepo clone lightweight tag command output is correct'
28
+ }
29
+
30
+ # Do the subrepo clone with tag and test the output:
31
+ {
32
+ clone_output="$(
33
+ cd $OWNER/foo
34
+ git subrepo clone ../bar/.git -b annotated_tag ann 2>&1 || true
35
+ )"
36
+
37
+ # Check output is correct:
38
+ is "$clone_output" \
39
+ "Subrepo '../bar/.git' (annotated_tag) cloned into 'ann'." \
40
+ 'subrepo clone annotated command output is correct'
41
+ }
42
+
43
+ done_testing
44
+
45
+ teardown
@@ -0,0 +1,107 @@
1
+ #!/usr/bin/env bash
2
+
3
+ set -e
4
+
5
+ source test/setup
6
+
7
+ use Test::More
8
+
9
+ clone-foo-and-bar
10
+
11
+ (
12
+ mkdir -p "$OWNER/empty"
13
+ git init "$OWNER/empty"
14
+ )
15
+
16
+ # Test that the repos look ok:
17
+ {
18
+ test-exists \
19
+ "$OWNER/foo/.git/" \
20
+ "$OWNER/foo/Foo" \
21
+ "!$OWNER/foo/bar/" \
22
+ "$OWNER/bar/.git/" \
23
+ "$OWNER/bar/Bar" \
24
+ "$OWNER/empty/.git/"
25
+ }
26
+
27
+ # Do the subrepo clone and test the output:
28
+ {
29
+ clone_output="$(
30
+ cd $OWNER/foo
31
+ git subrepo clone ../../../$UPSTREAM/bar
32
+ )"
33
+
34
+ # Check output is correct:
35
+ is "$clone_output" \
36
+ "Subrepo '../../../tmp/upstream/bar' (master) cloned into 'bar'." \
37
+ 'subrepo clone command output is correct'
38
+
39
+ remote_output="$(
40
+ cd $OWNER/foo
41
+ git remote -v
42
+ )"
43
+
44
+ is "$(
45
+ cd $OWNER/foo
46
+ git remote -v | grep subrepo/bar
47
+ )" \
48
+ "" \
49
+ 'No remotes created'
50
+
51
+ clone_output_empty="$(
52
+ cd $OWNER/empty
53
+ catch git subrepo clone ../../../$UPSTREAM/bar
54
+ )"
55
+
56
+ # Check output is correct:
57
+ is "$clone_output_empty" \
58
+ "git-subrepo: You can't clone into an empty repository" \
59
+ 'subrepo empty clone command output is correct'
60
+ }
61
+
62
+ # Check that subrepo files look ok:
63
+ gitrepo=$OWNER/foo/bar/.gitrepo
64
+ {
65
+ test-exists \
66
+ "$OWNER/foo/bar/" \
67
+ "$OWNER/foo/bar/Bar" \
68
+ "$gitrepo" \
69
+ "!$OWNER/empty/bar/"
70
+ }
71
+
72
+ # Test foo/bar/.gitrepo file contents:
73
+ {
74
+ foo_clone_commit="$(cd $OWNER/foo; git rev-parse HEAD^)"
75
+ bar_head_commit="$(cd $OWNER/bar; git rev-parse HEAD)"
76
+ test-gitrepo-comment-block
77
+ test-gitrepo-field "remote" "../../../$UPSTREAM/bar"
78
+ test-gitrepo-field "branch" "master"
79
+ test-gitrepo-field "commit" "$bar_head_commit"
80
+ test-gitrepo-field "parent" "$foo_clone_commit"
81
+ test-gitrepo-field "cmdver" "`git subrepo --version`"
82
+ }
83
+
84
+ # Make sure status is clean:
85
+ {
86
+ git_status="$(
87
+ cd $OWNER/foo
88
+ git status -s
89
+ )"
90
+
91
+ is "$git_status" \
92
+ "" \
93
+ 'status is clean'
94
+
95
+ git_status_empty="$(
96
+ cd $OWNER/empty
97
+ git status -s
98
+ )"
99
+
100
+ is "$git_status_empty" \
101
+ "" \
102
+ 'status is clean'
103
+ }
104
+
105
+ done_testing
106
+
107
+ teardown