delta/git.git, branch rs/allocate-cache-entry-individually

cache.h: put single NUL at end of struct cache_entry

2011-10-26T22:25:59+00:00

Since in-memory index entries are allocated individually now, the
variable slack at the end meant to provide an eight byte alignment
is not needed anymore.  Have a single NUL instead.  This saves zero
to seven bytes for an entry, depending on its filename length.

Signed-off-by: Rene Scharfe 
Signed-off-by: Junio C Hamano

read-cache.c: allocate index entries individually

2011-10-26T22:25:59+00:00

The code to estimate the in-memory size of the index based on its on-disk
representation is subtly wrong for certain architecture-dependent struct
layouts.  Instead of fixing it, replace the code to keep the index entries
in a single large block of memory and allocate each entry separately
instead.  This is both simpler and more flexible, as individual entries
can now be freed.  Actually using that added flexibility is left for a
later patch.

Suggested-by: Junio C Hamano 
Signed-off-by: Rene Scharfe 
Signed-off-by: Junio C Hamano

Merge branch 'maint'

2011-10-24T04:49:14+00:00

* maint:
  Git 1.7.7.1
  RelNotes/1.7.7.1: setgid bit patch is about fixing "git init" via Makefile setting

Conflicts:
	GIT-VERSION-GEN

Git 1.7.7.1

2011-10-24T04:48:06+00:00

Signed-off-by: Junio C Hamano

RelNotes/1.7.7.1: setgid bit patch is about fixing "git init" via Makefile setting

2011-10-24T04:16:31+00:00

The change was actually about "git init -s" which sets the setgid bit on
SysV-style systems to allow shared access to a repository, and can provoke
errors on BSD-style systems, depending on how permissive the filesystem in
use wants to be.

More to the point, the patch was just taking a fix that arrived for
FreeBSD in v1.5.5 days and making it also apply to machines using an
(obscure) GNU userland/FreeBSD kernel mixture.

Signed-off-by: Jonathan Nieder 
Signed-off-by: Junio C Hamano

Update draft release notes to 1.7.8

2011-10-21T23:05:42+00:00

Signed-off-by: Junio C Hamano

Merge branch 'po/insn-editor'

2011-10-21T23:04:37+00:00

* po/insn-editor:
  "rebase -i": support special-purpose editor to edit insn sheet

Merge branch 'jc/broken-ref-dwim-fix'

2011-10-21T23:04:36+00:00

* jc/broken-ref-dwim-fix:
  resolve_ref(): report breakage to the caller without warning
  resolve_ref(): expose REF_ISBROKEN flag
  refs.c: move dwim_ref()/dwim_log() from sha1_name.c

Merge branch 'mh/ref-api'

2011-10-21T23:04:36+00:00

* mh/ref-api:
  clear_ref_cache(): inline function
  write_ref_sha1(): only invalidate the loose ref cache
  clear_ref_cache(): extract two new functions
  clear_ref_cache(): rename parameter
  invalidate_ref_cache(): expose this function in the refs API
  invalidate_ref_cache(): take the submodule as parameter
  invalidate_ref_cache(): rename function from invalidate_cached_refs()

Merge branch 'jc/match-refs-clarify'

2011-10-21T23:04:35+00:00

* jc/match-refs-clarify:
  rename "match_refs()" to "match_push_refs()"
  send-pack: typofix error message