user/sven/git.git/builtin-count-objects.c, branch v1.6.4.5

Merge branch 'maint-1.6.3' into maint-1.6.4

2010-01-19T05:37:06Z

* maint-1.6.3: base85: Make the code more obvious instead of explaining the non-obvious base85: encode_85() does not use the decode table base85 debug code: Fix length byte calculation checkout -m: do not try to fall back to --merge from an unborn branch branch: die explicitly why when calling "git branch [-a|-r] branchname". textconv: stop leaking file descriptors commit: --cleanup is a message option git count-objects: handle packs bigger than 4G t7102: make the test fail if one of its check fails Conflicts: builtin-commit.c

Merge branch 'maint-1.6.1' into maint-1.6.2

2010-01-10T08:49:47Z

* maint-1.6.1: base85: Make the code more obvious instead of explaining the non-obvious base85: encode_85() does not use the decode table base85 debug code: Fix length byte calculation checkout -m: do not try to fall back to --merge from an unborn branch branch: die explicitly why when calling "git branch [-a|-r] branchname". textconv: stop leaking file descriptors commit: --cleanup is a message option git count-objects: handle packs bigger than 4G t7102: make the test fail if one of its check fails Conflicts: diff.c

git count-objects: handle packs bigger than 4G

2009-12-30T03:51:37Z

Use off_t to count sizes of packs and objects to avoid overflow after 4Gb. Signed-off-by: Andreas Schwab Signed-off-by: Junio C Hamano

parse-opts: prepare for OPT_FILENAME

2009-05-25T08:07:25Z

To give OPT_FILENAME the prefix, we pass the prefix to parse_options() which passes the prefix to parse_options_start() which sets the prefix member of parse_opts_ctx accordingly. If there isn't a prefix in the calling context, passing NULL will suffice. Signed-off-by: Stephen Boyd Signed-off-by: Junio C Hamano

Merge branch 'jc/maint-1.6.0-keep-pack' into maint-1.6.1

2009-05-03T22:01:31Z

* jc/maint-1.6.0-keep-pack: pack-objects: don't loosen objects available in alternate or kept packs t7700: demonstrate repack flaw which may loosen objects unnecessarily Remove --kept-pack-only option and associated infrastructure pack-objects: only repack or loosen objects residing in "local" packs git-repack.sh: don't use --kept-pack-only option to pack-objects t7700-repack: add two new tests demonstrating repacking flaws is_kept_pack(): final clean-up Simplify is_kept_pack() Consolidate ignore_packed logic more has_sha1_kept_pack(): take "struct rev_info" has_sha1_pack(): refactor "pretend these packs do not exist" interface git-repack: resist stray environment variable

Merge branch 'jc/maint-1.6.0-keep-pack' into maint

2009-04-09T06:21:10Z

has_sha1_pack(): refactor "pretend these packs do not exist" interface

2009-02-28T09:06:06Z

Most of the callers of this function except only one pass NULL to its last parameter, ignore_packed. Introduce has_sha1_kept_pack() function that has the function signature and the semantics of this function, and convert the sole caller that does not pass NULL to call this new function. All other callers and has_sha1_pack() lose the ignore_packed parameter. Signed-off-by: Junio C Hamano

add is_dot_or_dotdot inline function

2009-01-11T21:21:57Z

A new inline function is_dot_or_dotdot is used to check if the directory name is either "." or "..". It returns a non-zero value if the given string is "." or "..". It's applicable to a lot of Git source code. Signed-off-by: Alexander Potashev Signed-off-by: Junio C Hamano

Correct output of git-count-objects.

2008-09-08T21:25:43Z

The non-verbose output was not changed in fdb2a2a (compat: introduce on_disk_bytes(), 2008-08-18) which caused git-count-objects to claim 512 times too much space used for loose objects. Signed-off-by: Junio C Hamano

Merge branch 'mg/count-objects'

2008-08-21T06:41:54Z

* mg/count-objects: count-objects: Add total pack size to verbose output