Finishing tasks for 0.4.0 release

Author: ingydotnet

Changes

@@ -1,4 +1,40 @@
 ---
+version: 0.4.0
+date:    Thu Nov  8 12:26:38 CET 2018
+changes:
+- Fix #325 Do not squash main repo commits
+- Improve error message for worktree handling
+- Make version checking portable. #307
+- #307, improve version check
+- #307, update version requirement
+- Fix part #308, Add stderr output if commands fail
+- Fix #306: Add check to prevent following commits with no .gitrepo
+- Remove dry-run flag as it's not implemented. Make sure branch --force delete worktree
+- Fix #296, Replace --first-parent with --ancestry-path
+- Fix #291, specify Trusty host to get new 2.x git
+- Fix #258, add --no-tags to git fetch
+- Test that no remotes are created during clone
+- #257 Remove remote creation to avoid problems with fetch --all
+- (origin/issue/150_to_0.4.0) Fix remove-worktree, remove unused parameters
+- Regenerate completion files
+- filter-branch operation should not be done on HEAD
+- Cleanup push and add hint to push directly after pull
+- Simplify cleanup and add worktree to status
+- Add --method option to init/clone, add a 'config' command
+- Updated unit tests to support the new logic
+- Use 'git worktree' for merge/rebase
+- Update docs to reflect how things should work
+- Make it possible to specify commit messages
+- Redesign, trash the tree hash approach and use merges instead
+- Add release branches to travis-ci
+- Add --method option to init/clone, add a 'config' command
+- Detect multiple pulls, use -u flag to decide
+- Don't reuse previous commit message when using --all
+- Update the docs for pull and push
+- Update error messages when failing merge/rebase
+- Fix env var bug in test/push.t
+- Do not overwrite author information
+---
 version: 0.3.1
 date:    Tue Jan  3 23:08:56 PST 2017
 changes:

Meta

@@ -1,11 +1,11 @@
 =meta: 0.0.2
 
 name: git-subrepo
-version: 0.3.1
+version: 0.4.0
 abstract: Git Submodule Alternative
 homepage: https://github.com/ingydotnet/git-subrepo#readme
 license: MIT
-copyright: 2013-2017
+copyright: 2013-2018
 
 author:
   name: Ingy döt Net

ReadMe.pod

@@ -1,7 +1,7 @@
 =pod
 
 =for comment
-DO NOT EDIT. This Pod was generated by Swim v0.1.41.
+DO NOT EDIT. This Pod was generated by Swim v0.1.46.
 See http://github.com/ingydotnet/swim-pm#readme
 
 =encoding utf8
@@ -10,7 +10,8 @@ See http://github.com/ingydotnet/swim-pm#readme
 
 git-subrepo - Git Submodule Alternative
 
-<badge travis ingydotnet/git-subrepo>
+=for html
+<a href="https://travis-ci.org/ingydotnet/git-subrepo"><img src="https://travis-ci.org/ingydotnet/git-subrepo.png" alt="git-subrepo"></a>
 
 =head1 Synopsis
 
@@ -682,14 +683,20 @@ C<irc.freenode.net>.
 
 =back
 
-=head1 Author
+=head1 Authors
 
-Written by Ingy döt Net <[email protected]>
+=over
+
+=item * Ingy döt Net <[email protected]>
+
+=item * Magnus Carlsson <[email protected]>
+
+=back
 
 =head1 License and Copyright
 
 The MIT License (MIT)
 
-Copyright (c) 2013-2017 Ingy döt Net
+Copyright (c) 2013-2018 Ingy döt Net
 
 =cut

doc/git-subrepo.swim

@@ -600,12 +600,13 @@ If you want to chat about the `git-subrepo` command, join `#gitcommands` on
 * Written in (very modern) Bash, with full test suite. Take a look.
 * A `.gitrepo` file never is in the top level dir (next to a `.git/` dir).
 
-= Author
+= Authors
 
-Written by Ingy döt Net <[email protected]>
+* Ingy döt Net <[email protected]>
+* Magnus Carlsson <[email protected]>
 
 = License and Copyright
 
 The MIT License (MIT)
 
-Copyright (c) 2013-2017 Ingy döt Net
+Copyright (c) 2013-2018 Ingy döt Net

man/man1/git-subrepo.1

@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 2.27 (Pod::Simple 3.29)
+.\" Automatically generated by Pod::Man 4.10 (Pod::Simple 3.35)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -46,7 +46,7 @@
 .ie \n(.g .ds Aq \(aq
 .el       .ds Aq '
 .\"
-.\" If the F register is turned on, we'll generate index entries on stderr for
+.\" If the F register is >0, we'll generate index entries on stderr for
 .\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
 .\" entries marked with X<> in POD.  Of course, you'll have to process the
 .\" output yourself in some meaningful fashion.
@@ -56,12 +56,12 @@
 ..
 .nr rF 0
 .if \n(.g .if rF .nr rF 1
-.if (\n(rF:(\n(.g==0)) \{
-.    if \nF \{
+.if (\n(rF:(\n(.g==0)) \{\
+.    if \nF \{\
 .        de IX
 .        tm Index:\\$1\t\\n%\t"\\$2"
 ..
-.        if !\nF==2 \{
+.        if !\nF==2 \{\
 .            nr % 0
 .            nr F 2
 .        \}
@@ -70,17 +70,15 @@
 .rr rF
 .\" ========================================================================
 .\"
-.IX Title "git-subrepo 1"
-.TH git-subrepo 1 "August 2017" "Generated by Swim v0.1.41" "Git Submodule Alternative"
+.IX Title "STDIN 1"
+.TH STDIN 1 "November 2018" "Generated by Swim v0.1.46" "Git Submodule Alternative"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
 .nh
 .SH "Name"
 .IX Header "Name"
 git-subrepo \- Git Submodule Alternative
-.PP
-<badge travis ingydotnet/git\-subrepo>
 .SH "Synopsis"
 .IX Header "Synopsis"
 .Vb 1
@@ -303,7 +301,7 @@ the \f(CW\*(C`branch\*(C'\fR command and merge things yourself before pushing if
 (although that is probably a rare use case).
 .Sp
 The \f(CW\*(C`push\*(C'\fR command requires a branch that has been properly merged/rebased
-with the upstream \s-1HEAD \s0(unless the upstream \s-1HEAD\s0 is empty, which is common
+with the upstream \s-1HEAD\s0 (unless the upstream \s-1HEAD\s0 is empty, which is common
 when doing a first \f(CW\*(C`push\*(C'\fR after an \f(CW\*(C`init\*(C'\fR). That means the upstream \s-1HEAD\s0 is
 one of the commits in the branch.
 .Sp
@@ -736,11 +734,14 @@ The \f(CW\*(C`git\-subrepo\*(C'\fR repo itself has 2 subrepos under the \f(CW\*(
 Written in (very modern) Bash, with full test suite. Take a look.
 .IP "\(bu" 4
 A \f(CW\*(C`.gitrepo\*(C'\fR file never is in the top level dir (next to a \f(CW\*(C`.git/\*(C'\fR dir).
-.SH "Author"
-.IX Header "Author"
-Written by Ingy döt Net <[email protected]>
+.SH "Authors"
+.IX Header "Authors"
+.IP "\(bu" 4
+Ingy döt Net <[email protected]>
+.IP "\(bu" 4
+Magnus Carlsson <[email protected]>
 .SH "License and Copyright"
 .IX Header "License and Copyright"
 The \s-1MIT\s0 License (\s-1MIT\s0)
 .PP
-Copyright (c) 2013\-2017 Ingy döt Net
+Copyright (c) 2013\-2018 Ingy döt Net

share/completion.bash

@@ -3,9 +3,9 @@
 # DO NOT EDIT. This file generated by pkg/bin/generate-completion.pl.
 
 _git_subrepo() {
-    local _opts=" -h --help --version -a --all -A --ALL -b= --branch= -e --edit -f --force -F --fetch -M= --method= --Default -m= --message= -N --dry-run -r= --remote= -s --squash -u --update -q --quiet -v --verbose -d --debug -x --DEBUG"
-    local subcommands="branch clean clone clone clone commit commit commit config fetch fetch fetch help help help init pull pull pull push push push status status status upgrade version"
-    local subdircommands="branch clean commit commit commit config fetch fetch fetch pull pull pull push push push status status status"
+    local _opts=" -h --help --version -a --all -A --ALL -b= --branch= -e --edit -f --force -F --fetch -M= --method= --Default -m= --message= -r= --remote= -s --squash -u --update -q --quiet -v --verbose -d --debug -x --DEBUG"
+    local subcommands="branch clean clone commit config fetch help init pull push status upgrade version"
+    local subdircommands="branch clean commit config fetch pull push status"
     local subcommand="$(__git_find_on_cmdline "$subcommands")"
 
     if [ -z "$subcommand" ]; then

share/zsh-completion/_git-subrepo

@@ -27,7 +27,6 @@ _git-subrepo() {
         '(-M --method)'{-M,--method}'[Method when you join, valid options are '"'"'merge'"'"' or '"'"'rebase'"'"']:M' \
         '--Default[is '"'"'merge'"'"']' \
         '(-m --message)'{-m,--message}'[Specify a commit message]:m' \
-        '(-N --dry-run)'{-N,--dry-run}'[Don'"'"'t push or commit (prints next commands to run)]' \
         '(-r --remote)'{-r,--remote}'[Specify the upstream remote to push/pull/fetch]:r' \
         '(-s --squash)'{-s,--squash}'[Squash commits on push]' \
         '(-u --update)'{-u,--update}'[Add the --branch and/or --remote overrides to .gitrepo]' \
@@ -39,7 +38,7 @@ _git-subrepo() {
 
     case $state in
     subcmd)
-        compadd branch clean clone clone clone commit commit commit config fetch fetch fetch help help help init pull pull pull push push push status status status upgrade version
+        compadd branch clean clone commit config fetch help init pull push status upgrade version
     ;;
 
     args)
@@ -58,7 +57,7 @@ _git-subrepo() {
                 esac
         ;;
 
-        branch|clean|commit|commit|commit|config|fetch|fetch|fetch|pull|pull|pull|push|push|push|status|status|status)
+        branch|clean|commit|config|fetch|pull|push|status)
             _compadd_subdirs
         ;;
 
@@ -67,7 +66,7 @@ _git-subrepo() {
         ;;
 
         help)
-            compadd branch clean clone clone clone commit commit commit config fetch fetch fetch help help help init pull pull pull push push push status status status upgrade version
+            compadd branch clean clone commit config fetch help init pull push status upgrade version
         ;;
         esac
     ;;