Package: git-subrepo / 0.4.9-3

Metadata

Package Version Patches format
git-subrepo 0.4.9-3 3.0 (quilt)

Patch series

view the series file
Patch File delta Description
0001 Fixed failed test in 0.4.9.patch | (download)

lib/git-subrepo | 3 1 + 2 - 0 !
1 file changed, 1 insertion(+), 2 deletions(-)

 fixed failed test in 0.4.9

This is already fixed upstream after 0.4.9 (so not forwarding):
- Fix subrepo init failing if defaultbranch not set (b00d41b)
- Support older versions of git for subrep init (57de7d6)

This patch is going to be removed in next upstream update.

0002 Fixed bash completion integration with git.patch | (download)

Makefile | 29 18 + 11 - 0 !
lib/git-subrepo | 21 4 + 17 - 0 !
2 files changed, 22 insertions(+), 28 deletions(-)

 fixed bash-completion integration with git

Using the 'make install' method, the default 'git-core' location
of git-subrepo executable does not automatically integrate git-subrepo
into git's own bash-completion. This change moves git-subrepo executable
with support scripts into /usr/share/git-subrepo. Then a symlink to the
'git-subrepo' executable script has been added into /usr/bin to achieve
recognition of the 'git subrepo' sub-command under the git bash-completion
(through git's: --list-cmds=...,other,...).

Additional adjustment of Makefile and git-subrepo script were made to
make Makefile more generic and to make DESTDIR usage together with
potentially overridden install vars more manageable.
By overriding INSTALL_LIB and INSTALL_EXT to the same path, we achieve
removal of the unnecessary 'git-subrepo.d' subdirectory inside the
/usr/share/git-subrepo path.

Note that non 'make install' ways of installation should work as
before but without the need for the GIT_SUBREPO_ROOT variable.
Potentially, if 'realpath' addition in git-sibrepo change isn't available
on all target systems, readlink could still be used instead.

0003 Define project wide GIT setup for all tests.patch | (download)

Makefile | 2 1 + 1 - 0 !
test/00-git-config.t | 55 55 + 0 - 0 !
test/setup | 17 9 + 8 - 0 !
3 files changed, 65 insertions(+), 9 deletions(-)

 define project-wide git setup for all tests

Local git config 'autocrlf' has been removed.
Run tests with fixed locale.
Disabling system/global git configs and setting default project-wide GIT
configuration for the duration of running tests. Temporary GIT
configuration is set inside git-subrepo project-top-dir.
Also, initialize own git repo, if project isn't a git clone and ensure
that the project is not in a GIT detached HEAD state.

0004 Generate test git repos instead of committed binarie.patch | (download)

Makefile | 2 1 + 1 - 0 !
test/genbar | 31 31 + 0 - 0 !
test/genfoo | 26 26 + 0 - 0 !
test/geninit | 60 60 + 0 - 0 !
test/setup | 12 12 + 0 - 0 !
5 files changed, 130 insertions(+), 1 deletion(-)

 generate test git-repos instead of committed binaries

Instead of having test repos: foo, bar and init committed in a
binary form, generate them using the test/gen* scripts before
starting the first 'test' session. Running 'make clean' removes
the generated test repos.
The original 'binary' test repos are being handled via d/rules
while still existing upstrem.

0005 Fixing shellcheck errors found during docker test.patch | (download)

test/issue29.t | 4 2 + 2 - 0 !
test/issue95.t | 2 1 + 1 - 0 !
test/issue96.t | 2 1 + 1 - 0 !
test/setup | 2 1 + 1 - 0 !
4 files changed, 5 insertions(+), 5 deletions(-)

 fixing shellcheck errors found during docker-test


0006 Fixing tests running on macos github.patch | (download)

Makefile | 3 2 + 1 - 0 !
lib/git-subrepo | 2 1 + 1 - 0 !
share/pnrelpath.sh | 25 25 + 0 - 0 !
test/setup | 4 3 + 1 - 0 !
4 files changed, 31 insertions(+), 3 deletions(-)

 fixing tests running on macos (github)

Using 'readlink -f' instead of 'realpath'.
Added pure shell function to get relative path between two dirs.
Set LC_ALL only for Linux.
Echo 'uname' on 'make test'

0007 Set project wide ff_only git config for pull and mer.patch | (download)

test/00-git-config.t | 2 2 + 0 - 0 !
1 file changed, 2 insertions(+)

 set project-wide ff_only git-config for pull and merge


0008 Fixed git subrepo and tests if set ff_only.patch | (download)

lib/git-subrepo | 2 1 + 1 - 0 !
test/branch-rev-list-one-path.t | 2 1 + 1 - 0 !
test/branch-rev-list.t | 2 1 + 1 - 0 !
3 files changed, 3 insertions(+), 3 deletions(-)

 fixed git-subrepo and tests if set ff_only

Some tests failed, when ff_only is set in users git configuration;
like:
...
test/branch-rev-list-one-path.t .... Died at line 23 in main of test/branch-rev-list-one-path.t
test/branch-rev-list-one-path.t .... No subtests run
test/branch-rev-list.t ............. Died at line 26 in main of test/branch-rev-list.t
test/branch-rev-list.t ............. No subtests run
...

and git configuration is set like:
    $ git config --global pull.ff only
    $ git config --global merge.ff only