git, branch v1.5.5-rc2Fork of git SCM with my patches.http://git.kilabit.info/git/atom?h=v1.5.5-rc22008-03-28T03:43:51ZGIT 1.5.5-rc22008-03-28T03:43:51ZJunio C Hamanogitster@pobox.com2008-03-28T03:43:51Zurn:sha1:803d5158123346229d71de53818920efbc88ca0f
Signed-off-by: Junio C Hamano <gitster@pobox.com>
GIT 1.5.4.52008-03-28T03:36:35ZJunio C Hamanogitster@pobox.com2008-03-28T03:36:35Zurn:sha1:f8dd64fdbf47ac65c1b8d2ed25b789ae2655f8c8
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin-prune: protect objects listed on the command line2008-03-27T22:39:57ZJunio C Hamanogitster@pobox.com2008-03-25T06:20:51Zurn:sha1:fe308f53730f168be65c57c46e5c573b449b3e32
Finally, this resurrects the documented behaviour to protect other
objects listed on the command line from getting pruned.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin-prune.c: use parse_options()2008-03-27T20:55:15ZMichele Ballabiobarra_cuda@katamail.com2008-03-23T20:50:29Zurn:sha1:629de472b67bdb6b1fbdc72a95e1f569e3b8f02d
Using the OPT_DATE() introduced earlier, this updates builtin-prune to
use parse_options().
Signed-off-by: Michele Ballabio <barra_cuda@katamail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Add tests for git-prune2008-03-27T20:55:15ZMichele Ballabiobarra_cuda@katamail.com2008-03-23T21:34:34Zurn:sha1:0c62705a0d9730df027a4e4074a8d9d5293e0b9b
It seems that git prune changed behaviour with respect to revisions added
from command line, probably when it became a builtin. Currently, it prints
a short usage and exits: instead, it should take those revisions into
account and not prune them. So add a couple of test to point this out.
We'll be fixing this by switching to parse_options(), so add tests to
detect bogus command line parameters as well, to keep ourselves from
introducing regressions.
Signed-off-by: Michele Ballabio <barra_cuda@katamail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
parse-options.c: introduce OPT_DATE2008-03-27T20:55:15ZMichele Ballabiobarra_cuda@katamail.com2008-03-24T14:02:21Zurn:sha1:1f4a711a05e00db81da552dd990f6ddff4ffb63e
There are quite a few places that will need to call approxidate(),
when they'll adopt the parse-options system, so this patch adds the
function parse_opt_approxidate_cb(), used by OPT_DATE.
Signed-off-by: Michele Ballabio <barra_cuda@katamail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Update draft release notes for 1.5.52008-03-27T20:37:29ZJunio C Hamanogitster@pobox.com2008-03-27T20:37:29Zurn:sha1:1768905b51601d5d080168059acd24d13b888a2d
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Merge branch 'maint'2008-03-27T20:35:18ZJunio C Hamanogitster@pobox.com2008-03-27T20:35:18Zurn:sha1:319a36a5c2da8dd07993caac43b7820bff3b0d37
* maint:
Update draft release notes for 1.5.4.5
Documentation: clarify use of .git{ignore,attributes} versus .git/info/*
t/t3800-mktag.sh: use test_must_fail rather than '!'
Conflicts:
t/t3800-mktag.sh
Update draft release notes for 1.5.4.52008-03-27T20:14:20ZJunio C Hamanogitster@pobox.com2008-03-27T20:14:20Zurn:sha1:24362a5d3ffc5ef10ccbcd80b258a418a1c792b5
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Merge branch 'jc/maint-fetch-regression-1.5.4' into maint2008-03-27T20:03:56ZJunio C Hamanogitster@pobox.com2008-03-27T20:03:56Zurn:sha1:b88605f6d4b2b1b8dd805da9e91feccb68b4c840
* jc/maint-fetch-regression-1.5.4:
git-fetch test: test tracking fetch results, not just FETCH_HEAD
Fix branches file configuration
Tighten refspec processing