Hi,

Jonathan Nieder a écrit , Le 05/02/2014 00:01:
> reassign 737680 src:git 1:1.8.5.3-1
> merge 704652 737680
> quit
> 
> Hi,
> 
> Yann Dirson wrote:
> 
>> git-subtree is included in contrib/subtree/, it would be good to have
>> it in one of the debs.
> 
> Agreed.  I'll play with the patch from http://bugs.debian.org/704652
> tonight.  (It's missing rules to install the documentation and run
> tests, so if someone else wants to get to that before me, even
> better.)

I was surpised by this statement about missing documentation and tests,
because I checked these points before submiting the patch. I've just
rebuild release 1.9.0~rc3 with the very same patch and you're right
about the documentation part only: git-doc misses the git-subtree files.

But the man page is installed:
$ debc ../git_1.9.0~rc3-1.1_i386.changes git-man | grep 'git-subtree'
-rw-r--r-- root/root      5373 2014-02-08 13:13
./usr/share/man/man1/git-subtree.1.gz

And the git-subtree tests are run. Here is the relevant exerpt from the
build log:
make[1]: Entering directory `/tmp/buildd/git-1.9.0~rc3/contrib/subtree'
/usr/bin/make -C t/ test
make[2]: Entering directory `/tmp/buildd/git-1.9.0~rc3/contrib/subtree/t'
rm -f -r test-results
/usr/bin/make aggregate-results-and-cleanup
make[3]: Entering directory `/tmp/buildd/git-1.9.0~rc3/contrib/subtree/t'
*** t7900-subtree.sh ***
ok 1 - init subproj
ok 2 - add sub1
ok 3 - add sub2
...
ok 55 - verify one file change per commit
# passed all 55 test(s)
1..55
/usr/bin/make aggregate-results
make[4]: Entering directory `/tmp/buildd/git-1.9.0~rc3/contrib/subtree/t'
for f in ../../../t/test-results/t*-*.counts; do \
                echo "$f"; \
        done | '/bin/sh' ../../../t/aggregate-results.sh
fixed   0
success 55
failed  0
broken  0
total   55
make[4]: Leaving directory `/tmp/buildd/git-1.9.0~rc3/contrib/subtree/t'

I'll update the patch to install the doc.

Thanks,

_g.

Attachment: signature.asc
Description: OpenPGP digital signature

Reply via email to