1 To: git@vger.kernel.org
2 Subject: What's in git.git (Apr 2009, #02; Wed, 29)
3 X-maint-at: a2dc04ba159def766ee17db00c60bdbda477955d
4 X-master-at: 6ffd567bec439e7809ee0966556bd5e72fb78de4
5 X-maint-was: 3bd1bb327eb4d3e386800897734f9f42b48280ff
6 X-master-was: c965c029330b1f81cc107c5d829e7fd79c61d8ea
8 What's in git.git (Apr 2009, #02; Wed, 29)
10 maint a2dc04b (Merge branch 'maint-1.6.1' into maint)
11 master 6ffd567 (improve error message in config.c)
12 ------------------------------------------------------------------------
14 It's been a while since I sent the "What's in" report. Hopefully we can
15 do an -rc4 this weekend and then 1.6.3 final next week.
17 * The 'maint' branch has these fixes since 1.6.2.3
20 builtin-merge: fix a typo in an error message
21 Documentation: fix a grammatical error in api-builtin.txt
24 tree_entry_interesting: a pathspec only matches at directory boundary
26 Clemens Buchacher (3):
27 add tests for merging with submodules
28 update cache for conflicting submodule entries
29 simplify output of conflicting merge
32 test-suite: adding a test for fast-export with tag variants
33 builtin-fast-export.c: turn error into warning
34 builtin-fast-export.c: fix crash on tagged trees
35 builtin-fast-export.c: handle nested tags
37 Frank Lichtenheld (2):
38 init: Do not segfault on big GIT_TEMPLATE_DIR environment variable
39 gitcvs-migration: Link to git-cvsimport documentation
42 doc/gitattributes: clarify location of config text
43 add-interactive: refactor mode hunk handling
46 Update docs on behaviour of 'core.sharedRepository' and 'git init
49 Johannes Schindelin (2):
50 Fix 'git checkout <submodule>' to update the index
51 Fix off-by-one in read_tree_recursive
54 t1301-shared-repo: fix forced modes test
57 match_tree_entry(): a pathspec only matches at directory boundaries
58 Describe fixes since 1.6.2.3
60 diff -c -p: do not die on submodules
63 Speed up reflog pruning of unreachable commits
66 Clean up reflog unreachability pruning decision
67 grep: fix segfault when "git grep '('" is given
69 Markus Heidelberg (2):
70 doc/git-daemon: add missing arguments to options
71 doc/git-daemon: add missing arguments to max-connections option
74 git add -p: new "quit" command at the prompt.
75 Update git-add.txt according to the new possibilities of 'git add -p'.
77 Nguyễn Thái Ngọc Duy (1):
78 Makefile: remove {fetch,send}-pack from PROGRAMS as they are builtins
81 imap-send: use correct configuration variable in documentation
84 test-genrandom: Add newline to usage string
87 Fix buffer overflow in config parser
90 git-apply: fix option description
93 * The 'master' branch has these since 1.6.3-rc0
94 in addition to the above.
97 Wait for git diff to finish in git difftool
98 Explain seemingly pointless use of system in difftool
99 improve error message in config.c
102 graph API: Added logic for colored edges
103 t4202-log: extend test coverage of graphing
104 graph API: fix extra space during pre_commit_line state
105 graph API: fix a bug in the rendering of octopus merges
108 Work around ash "alternate value" expansion bug
111 connect: replace inet_ntop with getnameinfo
112 daemon.c: fix segfault on OS X
115 shorten_unambiguous_ref(): add strict mode
116 for-each-ref: utilize core.warnAmbiguousRefs for :short-format
117 rev-parse: --abbrev-ref option to shorten ref name
120 Add parsing of elm aliases to git-send-email
123 t9001: use older Getopt::Long boolean prefix '--no' rather than '--no-'
124 t7700-repack: repack -a now works properly, expect success from test
127 Convert to use quiet option when available
130 difftool: remove merge options for opendiff, tkdiff, kdiff3 and xxdiff
131 difftool: remove the backup file feature
132 difftool: use perl built-ins when testing for msys
133 difftool: add a -y shortcut for --no-prompt
134 difftool: move 'git-difftool' out of contrib
135 difftool: add various git-difftool tests
136 difftool: add support for a difftool.prompt config variable
137 bash completion: add git-difftool
138 mergetool: use $( ... ) instead of `backticks`
139 difftool/mergetool: refactor commands to use git-mergetool--lib
140 mergetool--lib: simplify API usage by removing more global variables
143 Makefile: installing git in cygwin 1.7.0
144 doc: consistently use ASCIIDOC_EXTRA
147 git-shell: Add 'git-upload-archive' to allowed commands.
149 Felipe Contreras (1):
150 git config: error when editing a repo config and not being in one
153 Fix misspelled mergetool.keepBackup
156 gitweb: Fix snapshots requested via PATH_INFO
159 doc: clarify --no-track option
160 doc: refer to tracking configuration as "upstream"
161 doc/checkout: refer to git-branch(1) as appropriate
162 doc/checkout: split checkout and branch creation in synopsis
163 docs/checkout: clarify what "non-branch" means
164 add-interactive: refactor mode hunk handling
165 t7800: respect NO_PERL
166 Makefile: fix NO_PERL bug with gitweb
168 Johannes Schindelin (3):
169 Add an option not to use link(src, dest) && unlink(src) when that is
171 t5701: do not get stuck in empty-push/
172 Rename core.unreliableHardlinks to core.createObject
175 Windows: Work around intermittent failures in mingw_rename
176 Windows: Skip fstat/lstat optimization in write_entry()
177 builtin-help: silently tolerate unknown keys
178 remote.c: do not trigger remote.<name>.<var> codepath for two-level names
179 prune-packed: advanced progress even for non-existing fan-out directories
182 gitignore git-bisect--helper
183 unpack-trees: do not muck with attributes when we are not checking out
184 Update draft release notes to 1.6.3
185 read-tree A B: do not corrupt cache-tree
186 Move prime_cache_tree() to cache-tree.c
187 read-tree -m A B: prime cache-tree from the switched-to tree
188 checkout branch: prime cache-tree fully
189 Revert "stat_tracking_info(): only count real commits"
190 Makefile: ignore perl/ subdirectory under NO_PERL
192 merge-recursive: do not die on a conflicting submodule
195 Allow users to un-configure rename detection
196 process_{tree,blob}: show objects without buffering
197 show_object(): push path_name() call further down
201 Add semicolon to curly brace group in main Makefile
203 Markus Heidelberg (4):
204 doc/merge-config: list ecmerge as a built-in merge tool
205 git-mergetool/difftool: make (g)vimdiff workable under Windows
206 git-mergetool: add new merge tool TortoiseMerge
207 grep: don't support "grep.color"-like config options
210 git add -p: new "quit" command at the prompt.
211 Update git-add.txt according to the new possibilities of 'git add -p'.
212 clone: add test for push on an empty clone.
214 Michael J Gruber (3):
215 remote.c: use shorten_unambiguous_ref
216 test-lib.sh: Help test_create_repo() find the templates dir
217 Fix more typos/spelling in comments
219 Michał Kiedrowicz (6):
220 tests: test applying criss-cross rename patch
221 builtin-apply: keep information about files to be deleted
222 Documentation: boolean value may be given by on/off
223 tests: test applying criss-cross rename patch
224 builtin-apply: keep information about files to be deleted
225 tests: make test-apply-criss-cross-rename more robust
228 builtin-remote: fix typo in option description
229 Documentation: fix typos / spelling mistakes
230 Fix typos / spelling in comments
232 Nanako Shiraishi (1):
233 git-am: teach git-am to apply a patch to an unborn branch
235 Nguyễn Thái Ngọc Duy (3):
236 get_local_heads(): do not return random pointer if there is no head
237 attr: add GIT_ATTR_INDEX "direction"
238 archive: do not read .gitattributes in working directory
241 progress bar: round to the nearest instead of truncating down
244 NetBSD compilation fix
247 hook/update: example of how to prevent branch creation
250 archive tests: do not use .gitattributes in working directory
251 archive test: attributes
254 SubmittingPatches: itemize and reflect upon well written changes
256 Sebastian Pipping (1):
257 difftool/mergetool: add diffuse as merge and diff tool
259 Sitaram Chamarty (1):
260 Remove obsolete bug warning in man git-update-server-info
263 config.txt: add missing format.{subjectprefix,cc,attach} variables
264 Documentation: use lowercase for shallow and deep threading
265 git-show-branch.txt: cleanup example description
266 git-format-patch.txt: general rewordings and cleanups
267 config.txt: add missing 'the's and make words plural
268 config.txt: clarify sentences in the configuration and syntax sections
269 config.txt: Make configuration paragraph more consistent
271 Uwe Kleine-König (1):
272 parseopt: fix documentation for --keep-dashdash
274 Wesley J. Landaker (4):
275 Documentation: git-svn: fix spurious bolding that mangles the output
276 Documentation: git-svn: fix a grammatical error without awkwardness
277 Documentation: git-clean: fix minor grammatical errors
278 Documentation: git-clean: make description more readable
280 Wincent Colaiuta (1):
281 git add -p: add missing "q" to patch prompt