1 Subject: What's in git.git (Aug 2008, #06; Sat, 23)
2 X-maint-at: 913e0e99b6a6e63af6a062622a1f94bd78fd8052
3 X-master-at: d6096f17d2d5d9ccb453aabf8edc6ee238b166fc
4 X-maint-was: 9b99e641c11044dba661f574f9098d362a3f0ef8
5 X-master-was: ea3594e04184475226109a21e71c539ff5f139fd
7 What's in git.git (Aug 2008, #06; Sat, 23)
9 maint 913e0e9 (unpack_trees(): protect the handcrafted in-core index from read_cache())
10 master d6096f1 (Merge branch 'maint')
11 ------------------------------------------------------------------------
13 There are a few fix-up that just have started cooking in 'next/pu'; they
14 eventually should be merged to 'maint', but not yet.
16 There are quite a few topics graduated to 'master'.
18 * The 'maint' branch has these fixes since the last announcement.
21 revision.h: make show_early_output an extern which is defined in
23 compat/snprintf.c: handle snprintf's that always return the # chars
27 Completion: add missing '=' for 'diff --diff-filter'
30 git-svn: fix dcommit to urls with embedded usernames
33 unpack_trees(): protect the handcrafted in-core index from read_cache()
39 git-p4: Fix one-liner in p4_write_pipe function.
42 * The 'master' branch has these since the last announcement
43 in addition to the above.
46 Extend "checkout --track" DWIM to support more cases
49 remote.c: add a function for deleting a refspec array and use it (twice)
52 merge-base: teach "git merge-base" to drive underlying merge_bases_many()
55 git-merge documentation: more details about resolving conflicts
58 git-submodule: replace duplicated code with a module_list function
61 Teach "git diff -p" HTML funcname patterns
63 Johannes Schindelin (4):
64 t9700: remove useless check
65 tests: Clarify dependencies between tests, 'aggregate-results' and
68 test-lib: do not remove trash_directory if called with --debug
71 filter-branch: Grok special characters in tag names
73 Jonathan del Strother (1):
74 Revert "Convert output messages in merge-recursive to past tense."
77 documentation: merge-base: explain "git merge-base" with more than 2 args
78 merge-base-many: add trivial tests based on the documentation
79 git-merge-octopus: use (merge-base A (merge B C D E...)) for stepwise
81 update-index: refuse to add working tree items beyond symlinks
82 add: refuse to add working tree items beyond symlinks
83 index: future proof for "extended" index entries
84 tests: use $TEST_DIRECTORY to refer to the t/ directory
85 templates/Makefile: install is unnecessary, just use mkdir -p
87 Karl Hasselström (4):
88 Refactoring: Split up diff_tree_stdin
89 diff-tree: Note that the commit ID is printed with --stdin
90 Teach git diff-tree --stdin to diff trees
91 Add test for diff-tree --stdin with two trees
94 Teach "git diff -p" Python funcname patterns
97 count-objects: Add total pack size to verbose output
98 Update t/.gitignore to ignore all trash directories
101 Make push more verbose about illegal combination of options
104 git-submodule - Add 'foreach' subcommand
107 config.mak.in: Pass on LDFLAGS from configure
110 provide more errors for the "merge into empty head" case
112 Peter Valdemar Mørch (2):
113 Teach git log --check to return an appropriate exit code
114 Teach git log --exit-code to return an appropriate exit code
117 builtin-reflog: Allow reflog expire to name partial ref
120 Make reflog query '@{1219188291}' act as '@{2008.8.19.16:24:51.-0700}'
123 Fix commit_tree() buffer leak