user/sven/git.git, branch v1.7.9.3

Git 1.7.9.3

2012-03-05T22:29:07Z

Signed-off-by: Junio C Hamano

Merge branch 'jc/doc-merge-options' into maint

2012-03-05T22:28:14Z

* jc/doc-merge-options: Documentation/merge-options.txt: group "ff" related options together

Merge branch 'cn/maint-rev-list-doc' into maint

2012-03-05T22:27:36Z

* cn/maint-rev-list-doc: Documentation: use {asterisk} in rev-list-options.txt when needed

fast-import: zero all of 'struct tag' to silence valgrind

2012-03-05T17:36:09Z

When running t9300, valgrind (correctly) complains about an uninitialized value in write_crash_report: ==2971== Use of uninitialised value of size 8 ==2971== at 0x4164F4: sha1_to_hex (hex.c:70) ==2971== by 0x4073E4: die_nicely (fast-import.c:468) ==2971== by 0x43284C: die (usage.c:86) ==2971== by 0x40420D: main (fast-import.c:2731) ==2971== Uninitialised value was created by a heap allocation ==2971== at 0x4C29B3D: malloc (vg_replace_malloc.c:263) ==2971== by 0x433645: xmalloc (wrapper.c:35) ==2971== by 0x405DF5: pool_alloc (fast-import.c:619) ==2971== by 0x407755: pool_calloc.constprop.14 (fast-import.c:634) ==2971== by 0x403F33: main (fast-import.c:3324) Fix this by zeroing all of the 'struct tag'. We would only need to zero out the 'sha1' field, but this way seems more future-proof. Signed-off-by: Thomas Rast Signed-off-by: Junio C Hamano

Update draft release notes to 1.7.9.3 for the last time

2012-03-05T06:21:30Z

Signed-off-by: Junio C Hamano

Merge branch 'cn/maint-branch-with-bad' into maint

2012-03-05T06:17:52Z

* cn/maint-branch-with-bad: branch: don't assume the merge filter ref exists Conflicts: t/t3200-branch.sh

Merge branch 'jn/maint-gitweb-invalid-regexp' into maint

2012-03-05T06:17:47Z

* jn/maint-gitweb-invalid-regexp: gitweb: Handle invalid regexp in regexp search

Merge branch 'nd/maint-verify-objects' into maint

2012-03-05T06:17:41Z

* nd/maint-verify-objects: rev-list: fix --verify-objects --quiet becoming --objects rev-list: remove BISECT_SHOW_TRIED flag

Merge branch 'jk/maint-avoid-streaming-filtered-contents' into maint

2012-03-05T06:16:40Z

* jk/maint-avoid-streaming-filtered-contents: do not stream large files to pack when filters are in use teach dry-run convert_to_git not to require a src buffer teach convert_to_git a "dry run" mode

Merge branch 'jb/filter-ignore-sigpipe' into maint

2012-03-05T06:16:35Z

* jb/filter-ignore-sigpipe: Ignore SIGPIPE when running a filter driver