git 4.4.6 → 6.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (275) hide show
  1. checksums.yaml +4 -4
  2. data/.yardopts +1 -0
  3. data/CHANGELOG.md +348 -39
  4. data/CONTRIBUTING.md +1014 -144
  5. data/README.md +386 -504
  6. data/UPGRADING.md +1822 -0
  7. data/git.gemspec +102 -22
  8. data/lib/git/author_info.rb +65 -0
  9. data/lib/git/branch_delete_failure.rb +34 -0
  10. data/lib/git/branch_delete_result.rb +66 -0
  11. data/lib/git/branch_info.rb +237 -0
  12. data/lib/git/command_line/base.rb +247 -0
  13. data/lib/git/command_line/capturing.rb +308 -0
  14. data/lib/git/command_line/result.rb +88 -0
  15. data/lib/git/command_line/streaming.rb +236 -0
  16. data/lib/git/command_line.rb +45 -323
  17. data/lib/git/commands/add.rb +139 -0
  18. data/lib/git/commands/am/abort.rb +43 -0
  19. data/lib/git/commands/am/apply.rb +263 -0
  20. data/lib/git/commands/am/continue.rb +43 -0
  21. data/lib/git/commands/am/quit.rb +43 -0
  22. data/lib/git/commands/am/retry.rb +49 -0
  23. data/lib/git/commands/am/show_current_patch.rb +64 -0
  24. data/lib/git/commands/am/skip.rb +42 -0
  25. data/lib/git/commands/am.rb +33 -0
  26. data/lib/git/commands/apply.rb +242 -0
  27. data/lib/git/commands/archive/list_formats.rb +46 -0
  28. data/lib/git/commands/archive.rb +145 -0
  29. data/lib/git/commands/arguments.rb +4521 -0
  30. data/lib/git/commands/base.rb +522 -0
  31. data/lib/git/commands/branch/copy.rb +102 -0
  32. data/lib/git/commands/branch/create.rb +177 -0
  33. data/lib/git/commands/branch/delete.rb +88 -0
  34. data/lib/git/commands/branch/list.rb +178 -0
  35. data/lib/git/commands/branch/move.rb +102 -0
  36. data/lib/git/commands/branch/set_upstream.rb +86 -0
  37. data/lib/git/commands/branch/show_current.rb +49 -0
  38. data/lib/git/commands/branch/unset_upstream.rb +53 -0
  39. data/lib/git/commands/branch.rb +34 -0
  40. data/lib/git/commands/cat_file/batch.rb +385 -0
  41. data/lib/git/commands/cat_file/filtered.rb +105 -0
  42. data/lib/git/commands/cat_file/raw.rb +203 -0
  43. data/lib/git/commands/cat_file.rb +49 -0
  44. data/lib/git/commands/checkout/branch.rb +153 -0
  45. data/lib/git/commands/checkout/files.rb +116 -0
  46. data/lib/git/commands/checkout.rb +38 -0
  47. data/lib/git/commands/checkout_index.rb +106 -0
  48. data/lib/git/commands/clean.rb +102 -0
  49. data/lib/git/commands/clone.rb +241 -0
  50. data/lib/git/commands/commit.rb +273 -0
  51. data/lib/git/commands/commit_tree.rb +101 -0
  52. data/lib/git/commands/config_option_syntax/add.rb +86 -0
  53. data/lib/git/commands/config_option_syntax/get.rb +121 -0
  54. data/lib/git/commands/config_option_syntax/get_all.rb +118 -0
  55. data/lib/git/commands/config_option_syntax/get_color.rb +95 -0
  56. data/lib/git/commands/config_option_syntax/get_color_bool.rb +96 -0
  57. data/lib/git/commands/config_option_syntax/get_regexp.rb +119 -0
  58. data/lib/git/commands/config_option_syntax/get_urlmatch.rb +111 -0
  59. data/lib/git/commands/config_option_syntax/list.rb +111 -0
  60. data/lib/git/commands/config_option_syntax/remove_section.rb +79 -0
  61. data/lib/git/commands/config_option_syntax/rename_section.rb +83 -0
  62. data/lib/git/commands/config_option_syntax/replace_all.rb +109 -0
  63. data/lib/git/commands/config_option_syntax/set.rb +119 -0
  64. data/lib/git/commands/config_option_syntax/unset.rb +92 -0
  65. data/lib/git/commands/config_option_syntax/unset_all.rb +94 -0
  66. data/lib/git/commands/config_option_syntax.rb +56 -0
  67. data/lib/git/commands/describe.rb +156 -0
  68. data/lib/git/commands/diff.rb +657 -0
  69. data/lib/git/commands/diff_files.rb +519 -0
  70. data/lib/git/commands/diff_index.rb +499 -0
  71. data/lib/git/commands/fetch.rb +354 -0
  72. data/lib/git/commands/fsck.rb +138 -0
  73. data/lib/git/commands/gc.rb +134 -0
  74. data/lib/git/commands/grep.rb +339 -0
  75. data/lib/git/commands/init.rb +101 -0
  76. data/lib/git/commands/log.rb +634 -0
  77. data/lib/git/commands/ls_files.rb +195 -0
  78. data/lib/git/commands/ls_remote.rb +161 -0
  79. data/lib/git/commands/ls_tree.rb +135 -0
  80. data/lib/git/commands/maintenance/register.rb +73 -0
  81. data/lib/git/commands/maintenance/run.rb +105 -0
  82. data/lib/git/commands/maintenance/start.rb +67 -0
  83. data/lib/git/commands/maintenance/stop.rb +56 -0
  84. data/lib/git/commands/maintenance/unregister.rb +80 -0
  85. data/lib/git/commands/maintenance.rb +29 -0
  86. data/lib/git/commands/merge/abort.rb +44 -0
  87. data/lib/git/commands/merge/continue.rb +44 -0
  88. data/lib/git/commands/merge/quit.rb +46 -0
  89. data/lib/git/commands/merge/start.rb +250 -0
  90. data/lib/git/commands/merge.rb +28 -0
  91. data/lib/git/commands/merge_base.rb +91 -0
  92. data/lib/git/commands/mv.rb +82 -0
  93. data/lib/git/commands/name_rev.rb +119 -0
  94. data/lib/git/commands/pull.rb +382 -0
  95. data/lib/git/commands/push.rb +251 -0
  96. data/lib/git/commands/read_tree.rb +154 -0
  97. data/lib/git/commands/remote/add.rb +96 -0
  98. data/lib/git/commands/remote/get_url.rb +68 -0
  99. data/lib/git/commands/remote/list.rb +56 -0
  100. data/lib/git/commands/remote/prune.rb +63 -0
  101. data/lib/git/commands/remote/remove.rb +52 -0
  102. data/lib/git/commands/remote/rename.rb +76 -0
  103. data/lib/git/commands/remote/set_branches.rb +70 -0
  104. data/lib/git/commands/remote/set_head.rb +89 -0
  105. data/lib/git/commands/remote/set_url.rb +78 -0
  106. data/lib/git/commands/remote/set_url_add.rb +70 -0
  107. data/lib/git/commands/remote/set_url_delete.rb +71 -0
  108. data/lib/git/commands/remote/show.rb +77 -0
  109. data/lib/git/commands/remote/update.rb +79 -0
  110. data/lib/git/commands/remote.rb +42 -0
  111. data/lib/git/commands/repack.rb +281 -0
  112. data/lib/git/commands/reset.rb +154 -0
  113. data/lib/git/commands/rev_parse.rb +304 -0
  114. data/lib/git/commands/revert/abort.rb +45 -0
  115. data/lib/git/commands/revert/continue.rb +62 -0
  116. data/lib/git/commands/revert/quit.rb +47 -0
  117. data/lib/git/commands/revert/skip.rb +44 -0
  118. data/lib/git/commands/revert/start.rb +158 -0
  119. data/lib/git/commands/revert.rb +29 -0
  120. data/lib/git/commands/rm.rb +113 -0
  121. data/lib/git/commands/show.rb +632 -0
  122. data/lib/git/commands/show_ref/exclude_existing.rb +119 -0
  123. data/lib/git/commands/show_ref/exists.rb +75 -0
  124. data/lib/git/commands/show_ref/list.rb +149 -0
  125. data/lib/git/commands/show_ref/verify.rb +122 -0
  126. data/lib/git/commands/show_ref.rb +42 -0
  127. data/lib/git/commands/stash/apply.rb +81 -0
  128. data/lib/git/commands/stash/branch.rb +67 -0
  129. data/lib/git/commands/stash/clear.rb +43 -0
  130. data/lib/git/commands/stash/create.rb +60 -0
  131. data/lib/git/commands/stash/drop.rb +73 -0
  132. data/lib/git/commands/stash/list.rb +43 -0
  133. data/lib/git/commands/stash/pop.rb +87 -0
  134. data/lib/git/commands/stash/push.rb +112 -0
  135. data/lib/git/commands/stash/show.rb +158 -0
  136. data/lib/git/commands/stash/store.rb +72 -0
  137. data/lib/git/commands/stash.rb +38 -0
  138. data/lib/git/commands/status.rb +174 -0
  139. data/lib/git/commands/symbolic_ref/delete.rb +72 -0
  140. data/lib/git/commands/symbolic_ref/read.rb +99 -0
  141. data/lib/git/commands/symbolic_ref/update.rb +79 -0
  142. data/lib/git/commands/symbolic_ref.rb +38 -0
  143. data/lib/git/commands/tag/create.rb +142 -0
  144. data/lib/git/commands/tag/delete.rb +57 -0
  145. data/lib/git/commands/tag/list.rb +146 -0
  146. data/lib/git/commands/tag/verify.rb +71 -0
  147. data/lib/git/commands/tag.rb +26 -0
  148. data/lib/git/commands/update_ref/batch.rb +145 -0
  149. data/lib/git/commands/update_ref/delete.rb +90 -0
  150. data/lib/git/commands/update_ref/update.rb +103 -0
  151. data/lib/git/commands/update_ref.rb +42 -0
  152. data/lib/git/commands/version.rb +60 -0
  153. data/lib/git/commands/worktree/add.rb +139 -0
  154. data/lib/git/commands/worktree/list.rb +64 -0
  155. data/lib/git/commands/worktree/lock.rb +58 -0
  156. data/lib/git/commands/worktree/management_base.rb +51 -0
  157. data/lib/git/commands/worktree/move.rb +66 -0
  158. data/lib/git/commands/worktree/prune.rb +67 -0
  159. data/lib/git/commands/worktree/remove.rb +63 -0
  160. data/lib/git/commands/worktree/repair.rb +71 -0
  161. data/lib/git/commands/worktree/unlock.rb +47 -0
  162. data/lib/git/commands/worktree.rb +43 -0
  163. data/lib/git/commands/write_tree.rb +68 -0
  164. data/lib/git/commands.rb +88 -0
  165. data/lib/git/config.rb +64 -1
  166. data/lib/git/config_entry_info.rb +106 -0
  167. data/lib/git/configuring.rb +795 -0
  168. data/lib/git/detached_head_info.rb +57 -0
  169. data/lib/git/diff.rb +295 -12
  170. data/lib/git/diff_file_numstat_info.rb +31 -0
  171. data/lib/git/diff_file_patch_info.rb +136 -0
  172. data/lib/git/diff_file_raw_info.rb +129 -0
  173. data/lib/git/diff_info.rb +162 -0
  174. data/lib/git/diff_path_status.rb +80 -19
  175. data/lib/git/diff_result.rb +34 -0
  176. data/lib/git/diff_stats.rb +66 -14
  177. data/lib/git/dirstat_info.rb +102 -0
  178. data/lib/git/encoding_utils.rb +57 -1
  179. data/lib/git/errors.rb +107 -26
  180. data/lib/git/escaped_path.rb +55 -3
  181. data/lib/git/execution_context/global.rb +31 -0
  182. data/lib/git/execution_context/repository.rb +151 -0
  183. data/lib/git/execution_context.rb +559 -0
  184. data/lib/git/factories.rb +1049 -0
  185. data/lib/git/file_ref.rb +77 -0
  186. data/lib/git/fsck_object.rb +17 -9
  187. data/lib/git/fsck_result.rb +27 -16
  188. data/lib/git/log.rb +172 -65
  189. data/lib/git/object.rb +323 -108
  190. data/lib/git/parsers/branch.rb +240 -0
  191. data/lib/git/parsers/cat_file.rb +111 -0
  192. data/lib/git/parsers/config_entry.rb +110 -0
  193. data/lib/git/parsers/diff.rb +792 -0
  194. data/lib/git/parsers/fsck.rb +144 -0
  195. data/lib/git/parsers/grep.rb +42 -0
  196. data/lib/git/parsers/ls_remote.rb +79 -0
  197. data/lib/git/parsers/ls_tree.rb +58 -0
  198. data/lib/git/parsers/remote.rb +162 -0
  199. data/lib/git/parsers/stash.rb +292 -0
  200. data/lib/git/parsers/status.rb +251 -0
  201. data/lib/git/parsers/tag.rb +341 -0
  202. data/lib/git/parsers/worktree.rb +185 -0
  203. data/lib/git/path_resolver.rb +274 -0
  204. data/lib/git/remote_info.rb +203 -0
  205. data/lib/git/repository/branching.rb +796 -0
  206. data/lib/git/repository/committing.rb +221 -0
  207. data/lib/git/repository/context_helpers.rb +454 -0
  208. data/lib/git/repository/diffing.rb +743 -0
  209. data/lib/git/repository/inspecting.rb +252 -0
  210. data/lib/git/repository/logging.rb +410 -0
  211. data/lib/git/repository/maintenance.rb +65 -0
  212. data/lib/git/repository/merging.rb +429 -0
  213. data/lib/git/repository/object_operations.rb +1334 -0
  214. data/lib/git/repository/remote_operations.rb +772 -0
  215. data/lib/git/repository/shared_private.rb +120 -0
  216. data/lib/git/repository/staging.rb +409 -0
  217. data/lib/git/repository/stashing.rb +619 -0
  218. data/lib/git/repository/status_operations.rb +196 -0
  219. data/lib/git/repository/worktree_operations.rb +252 -0
  220. data/lib/git/repository.rb +204 -1
  221. data/lib/git/stash_info.rb +102 -0
  222. data/lib/git/status_file_info.rb +258 -0
  223. data/lib/git/status_info.rb +189 -0
  224. data/lib/git/system_call_guard.rb +95 -0
  225. data/lib/git/tag_delete_failure.rb +34 -0
  226. data/lib/git/tag_delete_result.rb +66 -0
  227. data/lib/git/tag_info.rb +99 -0
  228. data/lib/git/url.rb +12 -5
  229. data/lib/git/version.rb +111 -2
  230. data/lib/git/version_constraint.rb +85 -0
  231. data/lib/git/worktree_info.rb +128 -0
  232. data/lib/git.rb +319 -332
  233. metadata +318 -74
  234. data/.commitlintrc.yml +0 -38
  235. data/.github/copilot-instructions.md +0 -2733
  236. data/.github/issue_template.md +0 -15
  237. data/.github/pull_request_template.md +0 -17
  238. data/.github/workflows/continuous_integration.yml +0 -120
  239. data/.github/workflows/enforce_conventional_commits.yml +0 -29
  240. data/.github/workflows/experimental_continuous_integration.yml +0 -59
  241. data/.github/workflows/release.yml +0 -53
  242. data/.gitignore +0 -15
  243. data/.husky/commit-msg +0 -1
  244. data/.release-please-manifest.json +0 -3
  245. data/.rubocop.yml +0 -55
  246. data/.rubocop_todo.yml +0 -12
  247. data/Gemfile +0 -5
  248. data/Rakefile +0 -18
  249. data/lib/git/args_builder.rb +0 -111
  250. data/lib/git/author.rb +0 -16
  251. data/lib/git/base.rb +0 -1140
  252. data/lib/git/branch.rb +0 -423
  253. data/lib/git/branches.rb +0 -68
  254. data/lib/git/command_line_result.rb +0 -92
  255. data/lib/git/index.rb +0 -6
  256. data/lib/git/lib.rb +0 -2333
  257. data/lib/git/path.rb +0 -38
  258. data/lib/git/remote.rb +0 -39
  259. data/lib/git/stash.rb +0 -26
  260. data/lib/git/stashes.rb +0 -56
  261. data/lib/git/status.rb +0 -159
  262. data/lib/git/working_directory.rb +0 -6
  263. data/lib/git/worktree.rb +0 -39
  264. data/lib/git/worktrees.rb +0 -47
  265. data/package.json +0 -10
  266. data/redesign/1_architecture_existing.md +0 -66
  267. data/redesign/2_architecture_redesign.md +0 -130
  268. data/redesign/3_architecture_implementation.md +0 -138
  269. data/redesign/index.md +0 -34
  270. data/release-please-config.json +0 -36
  271. data/tasks/gem_tasks.rake +0 -10
  272. data/tasks/rubocop.rake +0 -12
  273. data/tasks/test.rake +0 -13
  274. data/tasks/test_gem.rake +0 -12
  275. data/tasks/yard.rake +0 -23
@@ -0,0 +1,67 @@
1
+ # frozen_string_literal: true
2
+
3
+ require 'git/commands/base'
4
+
5
+ module Git
6
+ module Commands
7
+ module Maintenance
8
+ # Initialize and start background maintenance on the current repository
9
+ #
10
+ # @example Start background maintenance with default scheduler
11
+ # Git::Commands::Maintenance::Start.new(execution_context).call
12
+ #
13
+ # @example Start with a specific scheduler
14
+ # Git::Commands::Maintenance::Start.new(execution_context).call(scheduler: 'crontab')
15
+ #
16
+ # @note `arguments` block audited against https://git-scm.com/docs/git-maintenance/2.54.0
17
+ #
18
+ # @see Git::Commands::Maintenance Git::Commands::Maintenance for the full sub-command list
19
+ #
20
+ # @see https://git-scm.com/docs/git-maintenance git-maintenance documentation
21
+ #
22
+ # @api private
23
+ #
24
+ class Start < Git::Commands::Base
25
+ arguments do
26
+ literal 'maintenance'
27
+ literal 'start'
28
+
29
+ value_option :scheduler, inline: true
30
+ execution_option :env
31
+ end
32
+
33
+ # @!method call(*, **options)
34
+ #
35
+ # @param options [Hash] command options
36
+ #
37
+ # @option options [String] :scheduler (nil) command option key; see overload docs
38
+ # for the full option list
39
+ #
40
+ # @overload call(**options)
41
+ #
42
+ # Initialize config values and start background maintenance
43
+ #
44
+ # This performs the same config updates as `register`, then updates
45
+ # the background scheduler to run `git maintenance run --scheduled`
46
+ # on an hourly basis.
47
+ #
48
+ # @param options [Hash] command options
49
+ #
50
+ # @option options [String] :scheduler (nil) specify the scheduler to use
51
+ #
52
+ # Must be one of 'auto', 'crontab', 'systemd-timer', 'launchctl', or 'schtasks'.
53
+ # When 'auto', the appropriate platform-specific scheduler is used.
54
+ # Default is 'auto'.
55
+ #
56
+ # @option options [Hash] :env (nil) environment variables to set for the git
57
+ # process; merged with the default environment; not passed to the git CLI
58
+ #
59
+ # @return [Git::CommandLine::Result] the result of calling `git maintenance start`
60
+ #
61
+ # @raise [ArgumentError] if unsupported options are provided
62
+ #
63
+ # @raise [Git::FailedError] if git exits with a non-zero exit status
64
+ end
65
+ end
66
+ end
67
+ end
@@ -0,0 +1,56 @@
1
+ # frozen_string_literal: true
2
+
3
+ require 'git/commands/base'
4
+
5
+ module Git
6
+ module Commands
7
+ module Maintenance
8
+ # Halt the background maintenance schedule
9
+ #
10
+ # @example Stop background maintenance
11
+ # Git::Commands::Maintenance::Stop.new(execution_context).call
12
+ #
13
+ # @note `arguments` block audited against https://git-scm.com/docs/git-maintenance/2.54.0
14
+ #
15
+ # @see Git::Commands::Maintenance Git::Commands::Maintenance for the full sub-command list
16
+ #
17
+ # @see https://git-scm.com/docs/git-maintenance git-maintenance documentation
18
+ #
19
+ # @api private
20
+ #
21
+ class Stop < Git::Commands::Base
22
+ arguments do
23
+ literal 'maintenance'
24
+ literal 'stop'
25
+
26
+ execution_option :env
27
+ end
28
+
29
+ # @!method call(*, **options)
30
+ #
31
+ # @param options [Hash] command options
32
+ #
33
+ # @option options [Hash] :env (nil) command option key; see overload docs
34
+ # for the full option list
35
+ #
36
+ # @overload call(**options)
37
+ #
38
+ # Halt the background maintenance schedule
39
+ #
40
+ # The current repository is not removed from the list of maintained
41
+ # repositories, in case the background maintenance is restarted later.
42
+ #
43
+ # @param options [Hash] command options
44
+ #
45
+ # @option options [Hash] :env (nil) environment variables to set for the git
46
+ # process; merged with the default environment; not passed to the git CLI
47
+ #
48
+ # @return [Git::CommandLine::Result] the result of calling `git maintenance stop`
49
+ #
50
+ # @raise [ArgumentError] if unsupported options are provided
51
+ #
52
+ # @raise [Git::FailedError] if git exits with a non-zero exit status
53
+ end
54
+ end
55
+ end
56
+ end
@@ -0,0 +1,80 @@
1
+ # frozen_string_literal: true
2
+
3
+ require 'git/commands/base'
4
+
5
+ module Git
6
+ module Commands
7
+ module Maintenance
8
+ # Remove the current repository from background maintenance
9
+ #
10
+ # @example Unregister the repository from maintenance
11
+ # Git::Commands::Maintenance::Unregister.new(execution_context).call
12
+ #
13
+ # @example Force unregister even if repository is not registered
14
+ # Git::Commands::Maintenance::Unregister.new(execution_context).call(force: true)
15
+ #
16
+ # @note `arguments` block audited against https://git-scm.com/docs/git-maintenance/2.54.0
17
+ #
18
+ # @see Git::Commands::Maintenance Git::Commands::Maintenance for the full sub-command list
19
+ #
20
+ # @see https://git-scm.com/docs/git-maintenance git-maintenance documentation
21
+ #
22
+ # @api private
23
+ #
24
+ class Unregister < Git::Commands::Base
25
+ arguments do
26
+ literal 'maintenance'
27
+ literal 'unregister'
28
+
29
+ flag_or_value_option :config_file, negatable: true
30
+ flag_option :force, negatable: true
31
+ execution_option :env
32
+ end
33
+
34
+ # @!method call(*, **options)
35
+ #
36
+ # @param options [Hash] command options
37
+ #
38
+ # @option options [Boolean, String, nil] :config_file (nil) command option key;
39
+ # see overload docs for the full option list
40
+ #
41
+ # @overload call(**options)
42
+ #
43
+ # Remove the current repository from background maintenance
44
+ #
45
+ # This only removes the repository from the configured list.
46
+ # It does not stop the background maintenance processes from running.
47
+ #
48
+ # Reports an error if the current repository is not already registered,
49
+ # unless `--force` is used.
50
+ #
51
+ # @param options [Hash] command options
52
+ #
53
+ # @option options [Boolean, String, nil] :config_file (nil) use a specified
54
+ # config file instead of the global config (`--config-file`)
55
+ #
56
+ # When a String, the path is passed as `--config-file <file>`.
57
+ #
58
+ # @option options [Boolean, nil] :no_config_file (nil) disable the config file
59
+ # (`--no-config-file`)
60
+ #
61
+ # @option options [Boolean, nil] :force (nil) return success even if repository is not registered
62
+ # (`--force`)
63
+ #
64
+ # @option options [Boolean, nil] :no_force (nil) fail if the repository is not registered
65
+ # (`--no-force`)
66
+ #
67
+ # @option options [Hash] :env (nil) environment variables to set for the git
68
+ # process; merged with the default environment; not passed to the git CLI
69
+ #
70
+ # @return [Git::CommandLine::Result] the result of calling `git maintenance unregister`
71
+ #
72
+ # @raise [ArgumentError] if unsupported options are provided
73
+ #
74
+ # @raise [Git::FailedError] if git exits with a non-zero exit status
75
+ #
76
+ # @api public
77
+ end
78
+ end
79
+ end
80
+ end
@@ -0,0 +1,29 @@
1
+ # frozen_string_literal: true
2
+
3
+ require_relative 'maintenance/register'
4
+ require_relative 'maintenance/run'
5
+ require_relative 'maintenance/start'
6
+ require_relative 'maintenance/stop'
7
+ require_relative 'maintenance/unregister'
8
+
9
+ module Git
10
+ module Commands
11
+ # Implements `git maintenance` subcommands for repository optimization
12
+ #
13
+ # Split into subclasses because each subcommand has a distinct purpose
14
+ # and option set:
15
+ #
16
+ # - {Maintenance::Run} — run one or more maintenance tasks
17
+ # - {Maintenance::Start} — initialize and start background maintenance
18
+ # - {Maintenance::Stop} — halt the background maintenance schedule
19
+ # - {Maintenance::Register} — add repository to maintenance config
20
+ # - {Maintenance::Unregister} — remove repository from maintenance config
21
+ #
22
+ # @see https://git-scm.com/docs/git-maintenance git-maintenance documentation
23
+ #
24
+ # @api private
25
+ #
26
+ module Maintenance
27
+ end
28
+ end
29
+ end
@@ -0,0 +1,44 @@
1
+ # frozen_string_literal: true
2
+
3
+ require 'git/commands/base'
4
+
5
+ module Git
6
+ module Commands
7
+ module Merge
8
+ # Implements `git merge --abort` to abort an in-progress merge
9
+ #
10
+ # Aborts the current merge and reconstructs the pre-merge state.
11
+ # If an autostash entry is present, applies it to the worktree.
12
+ #
13
+ # @example Abort a merge
14
+ # abort_cmd = Git::Commands::Merge::Abort.new(execution_context)
15
+ # abort_cmd.call
16
+ #
17
+ # @note `arguments` block audited against https://git-scm.com/docs/git-merge/2.53.0
18
+ #
19
+ # @see Git::Commands::Merge
20
+ #
21
+ # @see https://git-scm.com/docs/git-merge git-merge
22
+ #
23
+ # @api private
24
+ #
25
+ class Abort < Git::Commands::Base
26
+ arguments do
27
+ literal 'merge'
28
+ literal '--abort'
29
+ end
30
+
31
+ # @!method call()
32
+ #
33
+ # @overload call()
34
+ #
35
+ # Abort the current merge and reconstruct the pre-merge state
36
+ #
37
+ # @return [Git::CommandLine::Result] the result of calling
38
+ # `git merge --abort`
39
+ #
40
+ # @raise [Git::FailedError] if git exits with a non-zero exit status
41
+ end
42
+ end
43
+ end
44
+ end
@@ -0,0 +1,44 @@
1
+ # frozen_string_literal: true
2
+
3
+ require 'git/commands/base'
4
+
5
+ module Git
6
+ module Commands
7
+ module Merge
8
+ # Implements `git merge --continue` to complete a merge after conflict resolution
9
+ #
10
+ # After the user has resolved conflicts and staged the changes, the
11
+ # merge can be concluded with this command.
12
+ #
13
+ # @example Continue after resolving conflicts
14
+ # continue_cmd = Git::Commands::Merge::Continue.new(execution_context)
15
+ # continue_cmd.call
16
+ #
17
+ # @note `arguments` block audited against https://git-scm.com/docs/git-merge/2.53.0
18
+ #
19
+ # @see Git::Commands::Merge
20
+ #
21
+ # @see https://git-scm.com/docs/git-merge git-merge
22
+ #
23
+ # @api private
24
+ #
25
+ class Continue < Git::Commands::Base
26
+ arguments do
27
+ literal 'merge'
28
+ literal '--continue'
29
+ end
30
+
31
+ # @!method call()
32
+ #
33
+ # @overload call()
34
+ #
35
+ # Resume the in-progress merge after conflicts have been resolved
36
+ #
37
+ # @return [Git::CommandLine::Result] the result of calling
38
+ # `git merge --continue`
39
+ #
40
+ # @raise [Git::FailedError] if git exits with a non-zero exit status
41
+ end
42
+ end
43
+ end
44
+ end
@@ -0,0 +1,46 @@
1
+ # frozen_string_literal: true
2
+
3
+ require 'git/commands/base'
4
+
5
+ module Git
6
+ module Commands
7
+ module Merge
8
+ # Implements `git merge --quit` to quit an in-progress merge
9
+ #
10
+ # Forgets about the current merge in progress. Leaves the index and
11
+ # working tree as-is. If an autostash entry is present, saves it to
12
+ # the stash list.
13
+ #
14
+ # @example Quit the merge, leaving working tree as-is
15
+ # quit_cmd = Git::Commands::Merge::Quit.new(execution_context)
16
+ # quit_cmd.call
17
+ #
18
+ # @note `arguments` block audited against https://git-scm.com/docs/git-merge/2.53.0
19
+ #
20
+ # @see Git::Commands::Merge
21
+ #
22
+ # @see https://git-scm.com/docs/git-merge git-merge
23
+ #
24
+ # @api private
25
+ #
26
+ class Quit < Git::Commands::Base
27
+ arguments do
28
+ literal 'merge'
29
+ literal '--quit'
30
+ end
31
+
32
+ # @!method call()
33
+ #
34
+ # @overload call()
35
+ #
36
+ # Forget about the current merge in progress, leaving the index
37
+ # and working tree as-is
38
+ #
39
+ # @return [Git::CommandLine::Result] the result of calling
40
+ # `git merge --quit`
41
+ #
42
+ # @raise [Git::FailedError] if git exits with a non-zero exit status
43
+ end
44
+ end
45
+ end
46
+ end
@@ -0,0 +1,250 @@
1
+ # frozen_string_literal: true
2
+
3
+ require 'git/commands/base'
4
+
5
+ module Git
6
+ module Commands
7
+ module Merge
8
+ # Implements `git merge` to incorporate changes from named commits
9
+ #
10
+ # Joins two or more development histories together by incorporating
11
+ # changes from the named commits into the current branch.
12
+ #
13
+ # @example Simple merge
14
+ # merge = Git::Commands::Merge::Start.new(execution_context)
15
+ # merge.call('feature')
16
+ #
17
+ # @example Merge with no fast-forward
18
+ # merge.call('feature', ff: false, m: 'Merge feature branch')
19
+ #
20
+ # @example Squash merge
21
+ # merge.call('feature', squash: true)
22
+ #
23
+ # @example Merge with strategy option
24
+ # merge.call('feature', strategy: 'ort', strategy_option: 'theirs')
25
+ #
26
+ # @example Octopus merge (multiple branches)
27
+ # merge.call('branch1', 'branch2', 'branch3')
28
+ #
29
+ # @note `arguments` block audited against https://git-scm.com/docs/git-merge/2.53.0
30
+ #
31
+ # @see Git::Commands::Merge
32
+ #
33
+ # @see https://git-scm.com/docs/git-merge git-merge
34
+ #
35
+ # @api private
36
+ #
37
+ class Start < Git::Commands::Base
38
+ arguments do
39
+ literal 'merge'
40
+
41
+ # Commit behavior
42
+ flag_option :commit, negatable: true
43
+ flag_option %i[edit e], negatable: true
44
+
45
+ # Commit message cleanup
46
+ value_option :cleanup, inline: true
47
+
48
+ # Fast-forward behavior
49
+ flag_option :ff, negatable: true
50
+ flag_option :ff_only
51
+
52
+ # Signing
53
+ flag_or_value_option %i[gpg_sign S], negatable: true, inline: true
54
+
55
+ # Log message
56
+ flag_or_value_option :log, negatable: true, inline: true
57
+
58
+ # Trailers
59
+ flag_option :signoff, negatable: true
60
+
61
+ # Stat display
62
+ flag_option :stat, negatable: true
63
+ flag_option :compact_summary
64
+
65
+ # Squash
66
+ flag_option :squash
67
+
68
+ # Verification
69
+ flag_option :verify, negatable: true
70
+
71
+ # Strategy options
72
+ value_option %i[strategy s], inline: true
73
+ value_option %i[strategy_option X], inline: true, repeatable: true
74
+
75
+ # Signature verification
76
+ flag_option :verify_signatures, negatable: true
77
+
78
+ # Verbosity and progress
79
+ flag_option %i[quiet q]
80
+ flag_option %i[verbose v]
81
+ flag_option :progress, negatable: true
82
+
83
+ # Stash and history
84
+ flag_option :autostash, negatable: true
85
+ flag_option :allow_unrelated_histories, negatable: true
86
+
87
+ # Message options
88
+ value_option :m
89
+ value_option :into_name
90
+ value_option %i[file F], inline: true
91
+
92
+ # Conflict resolution
93
+ flag_option :rerere_autoupdate, negatable: true
94
+ flag_option :overwrite_ignore, negatable: true
95
+
96
+ end_of_options
97
+
98
+ # Positional: commits to merge (variadic, required)
99
+ operand :commit, repeatable: true, required: true
100
+ end
101
+
102
+ # @!method call(*, **options)
103
+ #
104
+ # @param options [Hash] command options
105
+ #
106
+ # @option options [Boolean, nil] :commit (nil) command option key; see overload
107
+ # docs for the full option list
108
+ #
109
+ # @overload call(*commit, **options)
110
+ #
111
+ # Execute the git merge command
112
+ #
113
+ # @param commit [Array<String>] one or more branch names, commit SHAs,
114
+ # or refs to merge into the current branch; multiple commits create
115
+ # an octopus merge
116
+ #
117
+ # @param options [Hash] command options
118
+ #
119
+ # @option options [Boolean, nil] :commit (nil) perform merge and commit the result (`--commit`)
120
+ #
121
+ # @option options [Boolean, nil] :no_commit (nil) do not perform a merge commit (`--no-commit`)
122
+ #
123
+ # @option options [Boolean, nil] :edit (nil) open an editor for the merge commit message (`--edit`)
124
+ #
125
+ # Alias: `:e`
126
+ #
127
+ # @option options [Boolean, nil] :no_edit (nil) skip the editor for the merge commit message (`--no-edit`)
128
+ #
129
+ # @option options [String] :cleanup (nil) how the merge message will be cleaned
130
+ # up before committing
131
+ #
132
+ # Accepted values include `strip`, `whitespace`, `verbatim`,
133
+ # `scissors`, and `default`. Emits `--cleanup=<mode>`.
134
+ #
135
+ # @option options [Boolean, nil] :ff (nil) allow fast-forward merges (`--ff`)
136
+ #
137
+ # @option options [Boolean, nil] :no_ff (nil) create a merge commit even when fast-forward is
138
+ # possible (`--no-ff`)
139
+ #
140
+ # @option options [Boolean, nil] :ff_only (nil) refuse to merge unless
141
+ # fast-forward is possible; emits `--ff-only`
142
+ #
143
+ # @option options [Boolean, String, nil] :gpg_sign (nil) GPG-sign the resulting
144
+ # merge commit (`--gpg-sign`)
145
+ #
146
+ # Pass a key ID string to select the signing key; pass `true` to use the
147
+ # committer identity. Alias: `:S`
148
+ #
149
+ # @option options [Boolean, nil] :no_gpg_sign (nil) countermand commit.gpgSign
150
+ # configuration (`--no-gpg-sign`)
151
+ #
152
+ # @option options [Boolean, Integer, nil] :log (nil) populate the merge message
153
+ # with one-line commit descriptions (`--log`)
154
+ #
155
+ # Pass an Integer `n` to limit to `n` entries (`--log=<n>`).
156
+ #
157
+ # @option options [Boolean, nil] :no_log (nil) do not list one-line commit descriptions
158
+ # (`--no-log`)
159
+ #
160
+ # @option options [Boolean, nil] :signoff (nil) add a Signed-off-by trailer to the commit
161
+ # message (`--signoff`)
162
+ #
163
+ # @option options [Boolean, nil] :no_signoff (nil) remove a Signed-off-by trailer from the
164
+ # commit message (`--no-signoff`)
165
+ #
166
+ # @option options [Boolean, nil] :stat (nil) show a diffstat at the end of the merge (`--stat`)
167
+ #
168
+ # @option options [Boolean, nil] :no_stat (nil) suppress the diffstat at the end of the merge (`--no-stat`)
169
+ #
170
+ # @option options [Boolean, nil] :compact_summary (nil) show a compact summary
171
+ # at the end of the merge; emits `--compact-summary`
172
+ #
173
+ # @option options [Boolean, nil] :squash (nil) produce working tree and index
174
+ # state as if a real merge happened, but do not commit; emits `--squash`
175
+ #
176
+ # @option options [Boolean, nil] :verify (nil) run pre-merge and commit-msg hooks (`--verify`)
177
+ #
178
+ # @option options [Boolean, nil] :no_verify (nil) bypass pre-merge and commit-msg hooks (`--no-verify`)
179
+ #
180
+ # @option options [String] :strategy (nil) merge strategy to use
181
+ # (e.g., `'ort'`, `'recursive'`, `'resolve'`, `'octopus'`, `'ours'`, `'subtree'`)
182
+ #
183
+ # Emits `--strategy=<strategy>`. Alias: `:s`
184
+ #
185
+ # @option options [String, Array<String>] :strategy_option (nil) pass
186
+ # option(s) to the merge strategy (e.g., `'ours'`, `'theirs'`, `'patience'`)
187
+ #
188
+ # Can be a single value or an array for multiple `--strategy-option` flags.
189
+ # Emits `--strategy-option=<option>`. Alias: `:X`
190
+ #
191
+ # @option options [Boolean, nil] :verify_signatures (nil) verify commit signatures
192
+ # on the tip of the side branch (`--verify-signatures`)
193
+ #
194
+ # @option options [Boolean, nil] :no_verify_signatures (nil) do not verify commit
195
+ # signatures (`--no-verify-signatures`)
196
+ #
197
+ # @option options [Boolean, nil] :quiet (nil) operate quietly; emits `--quiet`
198
+ #
199
+ # Alias: `:q`
200
+ #
201
+ # @option options [Boolean, nil] :verbose (nil) be verbose; emits `--verbose`
202
+ #
203
+ # Alias: `:v`
204
+ #
205
+ # @option options [Boolean, nil] :progress (nil) force progress status reporting (`--progress`)
206
+ #
207
+ # @option options [Boolean, nil] :no_progress (nil) suppress progress status reporting (`--no-progress`)
208
+ #
209
+ # @option options [Boolean, nil] :autostash (nil) automatically stash and unstash
210
+ # the working tree before and after the operation (`--autostash`)
211
+ #
212
+ # @option options [Boolean, nil] :no_autostash (nil) do not automatically stash and unstash
213
+ # the working tree (`--no-autostash`)
214
+ #
215
+ # @option options [Boolean, nil] :allow_unrelated_histories (nil) allow merging
216
+ # histories that do not share a common ancestor (`--allow-unrelated-histories`)
217
+ #
218
+ # @option options [Boolean, nil] :no_allow_unrelated_histories (nil) disallow merging
219
+ # unrelated histories (`--no-allow-unrelated-histories`)
220
+ #
221
+ # @option options [String] :m (nil) commit message for the merge commit;
222
+ # emits `-m <msg>`
223
+ #
224
+ # @option options [String] :into_name (nil) prepare the default merge message
225
+ # as if merging to the named branch; emits `--into-name <branch>`
226
+ #
227
+ # @option options [String] :file (nil) read the commit message from the given
228
+ # file; emits `--file=<file>`. Alias: `:F`
229
+ #
230
+ # @option options [Boolean, nil] :rerere_autoupdate (nil) allow rerere to update
231
+ # the index with the auto-resolved conflict result (`--rerere-autoupdate`)
232
+ #
233
+ # @option options [Boolean, nil] :no_rerere_autoupdate (nil) prevent rerere from
234
+ # auto-updating the index (`--no-rerere-autoupdate`)
235
+ #
236
+ # @option options [Boolean, nil] :overwrite_ignore (nil) silently overwrite ignored
237
+ # files from the merge result (`--overwrite-ignore`)
238
+ #
239
+ # @option options [Boolean, nil] :no_overwrite_ignore (nil) abort if the merge result
240
+ # would overwrite any ignored files (`--no-overwrite-ignore`)
241
+ #
242
+ # @return [Git::CommandLine::Result] the result of calling `git merge`
243
+ #
244
+ # @raise [ArgumentError] if unsupported options are provided
245
+ #
246
+ # @raise [Git::FailedError] if git exits with a non-zero exit status
247
+ end
248
+ end
249
+ end
250
+ end
@@ -0,0 +1,28 @@
1
+ # frozen_string_literal: true
2
+
3
+ require_relative 'merge/abort'
4
+ require_relative 'merge/continue'
5
+ require_relative 'merge/quit'
6
+ require_relative 'merge/start'
7
+
8
+ module Git
9
+ module Commands
10
+ # Commands for joining development histories via `git merge`
11
+ #
12
+ # This module contains command classes for the initial merge ({Start}) and
13
+ # session management ({Continue}, {Abort}, {Quit}):
14
+ #
15
+ # - {Merge::Start} — merge one or more branches into the current branch
16
+ # - {Merge::Continue} — resume after resolving merge conflicts (`--continue`)
17
+ # - {Merge::Abort} — abort the in-progress merge (`--abort`)
18
+ # - {Merge::Quit} — forget the in-progress merge but leave the working tree
19
+ # as-is (`--quit`)
20
+ #
21
+ # @see https://git-scm.com/docs/git-merge git-merge documentation
22
+ #
23
+ # @api private
24
+ #
25
+ module Merge
26
+ end
27
+ end
28
+ end