@matheusbsbs / matheus-bagliano / commits / bc80cabca3

What's cooking (2013/03 #07)

Junio C Hamano committed Mar 26, 2013 at 15:32 UTC bc80cabca35bc8f36b1833a0a48e18feb6367743
1 file changed +357 -636
whats-cooking.txt
+357 -636
@@ -1,19 +1,16 @@
1 To: git@vger.kernel.org
2 Bcc: lwn@lwn.net
3 -Subject: What's cooking in git.git (Mar 2013, #06; Thu, 21)
4 -X-master-at: 7b592fadf1e23b10b913e0771b9f711770597266
5 -X-next-at: ddc39398152011b6a071e28b0f18f69ba427d0c0
3 +Subject: What's cooking in git.git (Mar 2013, #07; Tue, 26)
4 +X-master-at: 2bba2f0e6542d541e9f27653d8c9d5fc8d0e679c
5 +X-next-at: 21b325ca9d683712f5399553f0472ba31ad5cf0f
6
7 -What's cooking in git.git (Mar 2013, #06; Thu, 21)
7 +What's cooking in git.git (Mar 2013, #07; Tue, 26)
8 --------------------------------------------------
9
10 Here are the topics that have been cooking. Commits prefixed with
11 '-' are only in 'pu' (proposed updates) while commits prefixed with
12 '+' are in 'next'.
13
14 -Quite a few topics have graduated to 'master'; they were all cooking
15 -in 'next' during the feature-freeze from the previous cycle.
16 -
14 You can find the changes described here in the integration branches
15 of the repositories listed at
16
@@ -22,363 +19,409 @@ of the repositories listed at
19 --------------------------------------------------
20 [Graduated to "master"]
21
25 -* ap/maint-update-index-h-is-for-help (2013-02-23) 1 commit
26 - (merged to 'next' on 2013-03-19 at 1d7d180)
27 - + update-index: allow "-h" to also display options
22 +* ap/maint-diff-rename-avoid-overlap (2013-03-06) 3 commits
23 + (merged to 'next' on 2013-03-19 at c3276cf)
24 + + tests: make sure rename pretty print works
25 + + diff: prevent pprint_rename from underrunning input
26 + + diff: Fix rename pretty-print when suffix and prefix overlap
27
29 - Originally merged to 'next' on 2013-02-25
28 + Originally merged to 'next' on 2013-03-06
29
31 - "git update-index -h" did not do the usual "-h(elp)" thing.
30 + The logic used by "git diff -M --stat" to shorten the names of
31 + files before and after a rename did not work correctly when the
32 + common prefix and suffix between the two filenames overlapped.
33
34
34 -* bc/commit-complete-lines-given-via-m-option (2013-02-19) 4 commits
35 - (merged to 'next' on 2013-03-19 at 1609f9d)
36 - + Documentation/git-commit.txt: rework the --cleanup section
37 - + git-commit: only append a newline to -m mesg if necessary
38 - + t7502: demonstrate breakage with a commit message with trailing newlines
39 - + t/t7502: compare entire commit message with what was expected
35 +* jc/describe (2013-02-28) 1 commit
36 + (merged to 'next' on 2013-03-19 at 89e6e47)
37 + + describe: --match=<pattern> must limit the refs even when used with --all
38
41 - Originally merged to 'next' on 2013-02-19
39 + Originally merged to 'next' on 2013-03-05
40
43 - 'git commit -m "$str"' when $str was already terminated with a LF
44 - now avoids adding an extra LF to the message.
41 + The "--match=<pattern>" option of "git describe", when used with
42 + "--all" to allow refs that are not annotated tags to be used as a
43 + base of description, did not restrict the output from the command
44 + to those that match the given pattern.
45
46 + We may want to have a looser matching that does not restrict to tags,
47 + but that can be done as a follow-up topic; this step is purely a bugfix.
48
47 -* da/difftool-fixes (2013-02-21) 4 commits
48 - (merged to 'next' on 2013-03-19 at ffcb23f)
49 - + t7800: "defaults" is no longer a builtin tool name
50 - + t7800: modernize tests
51 - + t7800: update copyright notice
52 - + difftool: silence uninitialized variable warning
49
54 - Originally merged to 'next' on 2013-02-25
50 +* jc/maint-reflog-expire-clean-mark-typofix (2013-03-05) 1 commit
51 + (merged to 'next' on 2013-03-19 at a4f9eac)
52 + + reflog: fix typo in "reflog expire" clean-up codepath
53
56 - Minor maintenance updates to difftool, and updates to its tests.
54 + Originally merged to 'next' on 2013-03-07
55
56 + In "git reflog expire", REACHABLE bit was not cleared from the
57 + correct objects.
58
59 -* da/downcase-u-in-usage (2013-02-24) 20 commits
60 - (merged to 'next' on 2013-02-26 at 977b67e)
61 - + contrib/mw-to-git/t/install-wiki.sh: use a lowercase "usage:" string
62 - + contrib/examples/git-remote.perl: use a lowercase "usage:" string
63 - + tests: use a lowercase "usage:" string
64 - + git-svn: use a lowercase "usage:" string
65 - + Documentation/user-manual.txt: use a lowercase "usage:" string
66 - + templates/hooks--update.sample: use a lowercase "usage:" string
67 - + contrib/hooks/setgitperms.perl: use a lowercase "usage:" string
68 - + contrib/examples: use a lowercase "usage:" string
69 - + contrib/fast-import/import-zips.py: use spaces instead of tabs
70 - + contrib/fast-import/import-zips.py: fix broken error message
71 - + contrib/fast-import: use a lowercase "usage:" string
72 - + contrib/credential: use a lowercase "usage:" string
73 - + git-cvsimport: use a lowercase "usage:" string
74 - + git-cvsimport: use a lowercase "usage:" string
75 - + git-cvsexportcommit: use a lowercase "usage:" string
76 - + git-archimport: use a lowercase "usage:" string
77 - + git-merge-one-file: use a lowercase "usage:" string
78 - + git-relink: use a lowercase "usage:" string
79 - + git-svn: use a lowercase "usage:" string
80 - + git-sh-setup: use a lowercase "usage:" string
59
82 - Originally merged to 'next' on 2013-02-26
60 +* jc/push-follow-tag (2013-03-05) 4 commits
61 + (merged to 'next' on 2013-03-19 at d302a10)
62 + + push: --follow-tags
63 + + commit.c: use clear_commit_marks_many() in in_merge_bases_many()
64 + + commit.c: add in_merge_bases_many()
65 + + commit.c: add clear_commit_marks_many()
66
67 + Originally merged to 'next' on 2013-03-09
68
85 -* dm/ni-maxhost-may-be-missing (2013-02-25) 1 commit
86 - (merged to 'next' on 2013-02-26 at 93ec2c9)
87 - + git-compat-util.h: Provide missing netdb.h definitions
69 + The new "--follow-tags" option tells "git push" to push relevant
70 + annotated tags when pushing branches out.
71
89 - Originally merged to 'next' on 2013-02-26
72
73 +* jc/reflog-reverse-walk (2013-03-23) 4 commits
74 + (merged to 'next' on 2013-03-25 at 1bcc1c4)
75 + + refs.c: fix fread error handling
76 + (merged to 'next' on 2013-03-19 at 25beb2a)
77 + + reflog: add for_each_reflog_ent_reverse() API
78 + + for_each_recent_reflog_ent(): simplify opening of a reflog file
79 + + for_each_reflog_ent(): extract a helper to process a single entry
80 + (this branch is tangled with nd/branch-show-rebase-bisect-state.)
81
92 -* gp/avoid-explicit-mention-of-dot-git-refs (2013-02-24) 1 commit
93 - (merged to 'next' on 2013-02-26 at ec42d98)
94 - + Fix ".git/refs" stragglers
82 + An internal function used to implement "git checkout @{-1}" was
83 + hard to use correctly.
84
96 - Originally merged to 'next' on 2013-02-26
85
86 +* jk/alias-in-bare (2013-03-08) 3 commits
87 + (merged to 'next' on 2013-03-19 at d2b4227)
88 + + setup: suppress implicit "." work-tree for bare repos
89 + + environment: add GIT_PREFIX to local_repo_env
90 + + cache.h: drop LOCAL_REPO_ENV_SIZE
91
99 -* gp/describe-match-uses-glob-pattern (2013-02-24) 1 commit
100 - (merged to 'next' on 2013-02-26 at c9cc789)
101 - + describe: Document --match pattern format
92 + Originally merged to 'next' on 2013-03-09
93
103 - Originally merged to 'next' on 2013-02-26
94 + An aliased command spawned from a bare repository that does not say
95 + it is bare with "core.bare = yes" is treated as non-bare by mistake.
96
97
106 -* jc/color-diff-doc (2013-02-22) 1 commit
107 - (merged to 'next' on 2013-02-25 at c37541c)
108 - + diff-options: unconfuse description of --color
98 +* jk/empty-archive (2013-03-10) 2 commits
99 + (merged to 'next' on 2013-03-19 at bb4eb61)
100 + + archive: handle commits with an empty tree
101 + + test-lib: factor out $GIT_UNZIP setup
102
110 - Originally merged to 'next' on 2013-02-25
103 + Originally merged to 'next' on 2013-03-12
104
105 + "git archive" reports a failure when asked to create an archive out
106 + of an empty tree. It would be more intuitive to give an empty
107 + archive back in such a case.
108
113 -* jc/fetch-raw-sha1 (2013-02-07) 4 commits
114 - (merged to 'next' on 2013-03-19 at d5363f6)
115 - + fetch: fetch objects by their exact SHA-1 object names
116 - + upload-pack: optionally allow fetching from the tips of hidden refs
117 - + fetch: use struct ref to represent refs to be fetched
118 - + parse_fetch_refspec(): clarify the codeflow a bit
109
120 - Originally merged to 'next' on 2013-02-14
110 +* jk/fast-export-object-lookup (2013-03-17) 2 commits
111 + (merged to 'next' on 2013-03-19 at 026ac3d)
112 + + fast-export: do not load blob objects twice
113 + + fast-export: rename handle_object function
114
122 - Allows requests to fetch objects at any tip of refs (including
123 - hidden ones). It seems that there may be use cases even outside
124 - Gerrit (e.g. $gmane/215701).
115 + Originally merged to 'next' on 2013-03-18
116
117
127 -* jc/maint-push-refspec-default-doc (2013-03-08) 1 commit
128 - (merged to 'next' on 2013-03-19 at 0b2fa41)
129 - + Documentation/git-push: clarify the description of defaults
118 +* jk/fully-peeled-packed-ref (2013-03-18) 4 commits
119 + (merged to 'next' on 2013-03-19 at fa92bc7)
120 + + pack-refs: add fully-peeled trait
121 + + pack-refs: write peeled entry for non-tags
122 + + use parse_object_or_die instead of die("bad object")
123 + + avoid segfaults on parse_object failure
124
131 - Originally merged to 'next' on 2013-03-14
125 + Originally merged to 'next' on 2013-03-18
126
133 - Clarify in the documentation "what" gets pushed to "where" when the
134 - command line to "git push" does not say these explicitly.
127 + Not that we do not actively encourage having annotated tags outside
128 + refs/tags/ hierarchy, but they were not advertised correctly to the
129 + ls-remote and fetch with recent version of Git.
130
131
137 -* jc/perl-cat-blob (2013-02-22) 1 commit
138 - (merged to 'next' on 2013-03-19 at ad3aae3)
139 - + Git.pm: fix cat_blob crashes on large files
132 +* jk/peel-ref (2013-03-16) 3 commits
133 + (merged to 'next' on 2013-03-19 at f0d4c16)
134 + + upload-pack: load non-tip "want" objects from disk
135 + + upload-pack: make sure "want" objects are parsed
136 + + upload-pack: drop lookup-before-parse optimization
137
141 - Originally merged to 'next' on 2013-02-25
138 + Originally merged to 'next' on 2013-03-18
139
143 - perl/Git.pm::cat_blob slurped everything in core only to write it
144 - out to a file descriptor, which was not a very smart thing to do.
140 + Recent optimization broke shallow clones.
141
142
147 -* jk/graph-c-expose-symbols-for-cgit (2013-03-03) 1 commit
148 - (merged to 'next' on 2013-03-04 at be35b12)
149 - + Revert "graph.c: mark private file-scope symbols as static"
143 +* jk/suppress-clang-warning (2013-02-25) 1 commit
144 + (merged to 'next' on 2013-03-19 at 1fd6858)
145 + + fix clang -Wtautological-compare with unsigned enum
146
151 - Originally merged to 'next' on 2013-03-04
147 + Originally merged to 'next' on 2013-03-14
148
153 - In the v1.8.0 era, we changed symbols that do not have to be global
154 - to file scope static, but a few functions in graph.c were used by
155 - CGit from sideways bypassing the entry points of the API the
156 - in-tree users use.
149
150 +* jl/submodule-deinit (2013-03-04) 1 commit
151 + (merged to 'next' on 2013-03-19 at d8367c5)
152 + + submodule: add 'deinit' command
153
159 -* jk/mailsplit-maildir-muttsort (2013-03-02) 1 commit
160 - (merged to 'next' on 2013-03-19 at 26f457c)
161 - + mailsplit: sort maildir filenames more cleverly
154 + Originally merged to 'next' on 2013-03-05
155
163 - Originally merged to 'next' on 2013-03-03
156 + There was no Porcelain way to say "I no longer am interested in
157 + this submodule", once you express your interest in a submodule with
158 + "submodule init". "submodule deinit" is the way to do so.
159
165 - Sort filenames read from the maildir/ in a way that is more likely
166 - to sort messages in the order the writing MUA meant to, by sorting
167 - numeric segment in numeric order and non-numeric segment in
168 - alphabetical order.
160
161 +* kb/p4merge (2013-03-25) 6 commits
162 + (merged to 'next' on 2013-03-25 at 4db939e)
163 + + merge-one-file: force content conflict for "both sides added" case
164 + + git-merge-one-file: send "ERROR:" messages to stderr
165 + + git-merge-one-file: style cleanup
166 + + merge-one-file: remove stale comment
167 + (merged to 'next' on 2013-03-19 at 43cc599)
168 + + mergetools/p4merge: create a base if none available
169 + + mergetools/p4merge: swap LOCAL and REMOTE
170
171 -* jk/utf-8-can-be-spelled-differently (2013-02-25) 1 commit
172 - (merged to 'next' on 2013-03-19 at 18ebb43)
173 - + utf8: accept alternate spellings of UTF-8
171 + Originally merged to 'next' on 2013-03-14
172
175 - Originally merged to 'next' on 2013-02-26
173 + Adjust the order mergetools feeds the files to the p4merge backend
174 + to match the p4 convention.
175 +
176 +
177 +* ks/rfc2047-one-char-at-a-time (2013-03-09) 1 commit
178 + (merged to 'next' on 2013-03-19 at 577ddf2)
179 + + format-patch: RFC 2047 says multi-octet character may not be split
180
177 - Some platforms and users spell UTF-8 differently; retry with the
178 - most official "UTF-8" when the system does not understand the
179 - user-supplied encoding name that are the common alternative
180 - spellings of UTF-8.
181 + Originally merged to 'next' on 2013-03-09
182 +
183 + When "format-patch" quoted a non-ascii strings on the header files,
184 + it incorrectly applied rfc2047 and chopped a single character in
185 + the middle of it.
186
187
183 -* jn/shell-disable-interactive (2013-03-09) 2 commits
184 - (merged to 'next' on 2013-03-19 at 4696604)
185 - + shell: new no-interactive-login command to print a custom message
186 - + shell doc: emphasize purpose and security model
188 +* lf/setup-prefix-pathspec (2013-03-14) 2 commits
189 + (merged to 'next' on 2013-03-19 at 0017e9e)
190 + + setup.c: check that the pathspec magic ends with ")"
191 + + setup.c: stop prefix_pathspec() from looping past the end of string
192
193 Originally merged to 'next' on 2013-03-14
194
190 - When the interactive access to git-shell is not enabled, we issue a
191 - message meant to help the system admininstrator to enable it. Add
192 - an explicit way to help the end users who connect to the service by
193 - issuing custom messages to refuse such an access.
195 + "git cmd -- ':(top'" was not diagnosed as an invalid syntax, and
196 + instead the parser kept reading beyond the end of the string.
197
198
196 -* lf/bundle-verify-list-prereqs (2013-03-08) 2 commits
197 - (merged to 'next' on 2013-03-08 at 9e55d6d)
198 - + bundle: Add colons to list headings in "verify"
199 - + bundle: Fix "verify" output if history is complete
199 +* mg/unsigned-time-t (2013-02-25) 2 commits
200 + (merged to 'next' on 2013-03-19 at 1fc1ad6)
201 + + Fix time offset calculation in case of unsigned time_t
202 + + date.c: fix unsigned time_t comparison
203
201 - Originally merged to 'next' on 2013-03-08
204 + Originally merged to 'next' on 2013-03-14
205
206 + A few workarounds for systems with unsigned time_t.
207
204 -* mg/gpg-interface-using-status (2013-02-14) 5 commits
205 - (merged to 'next' on 2013-03-19 at bd54c7a)
206 - + pretty: make %GK output the signing key for signed commits
207 - + pretty: parse the gpg status lines rather than the output
208 - + gpg_interface: allow to request status return
209 - + log-tree: rely upon the check in the gpg_interface
210 - + gpg-interface: check good signature in a reliable way
208
212 - Originally merged to 'next' on 2013-02-26
209 +* pe/pull-rebase-v-q (2013-03-16) 1 commit
210 + (merged to 'next' on 2013-03-19 at 10b311c)
211 + + pull: Apply -q and -v options to rebase mode as well
212
214 - Call "gpg" using the right API when validating the signature on
215 - tags.
213 + Originally merged to 'next' on 2013-03-18
214
215 + Teach "git pull --rebase" to pass "-v/-q" command line options to
216 + underlying "git rebase".
217
218 -* mn/send-email-works-with-credential (2013-02-27) 6 commits
219 - (merged to 'next' on 2013-03-19 at 2daad63)
220 - + git-send-email: use git credential to obtain password
221 - + Git.pm: add interface for git credential command
222 - + Git.pm: allow pipes to be closed prior to calling command_close_bidi_pipe
223 - + Git.pm: refactor command_close_bidi_pipe to use _cmd_close
224 - + Git.pm: fix example in command_close_bidi_pipe documentation
225 - + Git.pm: allow command_close_bidi_pipe to be called as method
218
227 - Originally merged to 'next' on 2013-02-27
219 +* ph/tag-force-no-warn-on-creation (2013-03-13) 1 commit
220 + (merged to 'next' on 2013-03-19 at b273fd3)
221 + + tag: --force does not have to warn when creating tags
222
229 - Hooks the credential system to send-email.
223 + Originally merged to 'next' on 2013-03-14
224
225 + "git tag -f <tag>" always said "Updated tag '<tag>'" even when
226 + creating a new tag (i.e. not overwriting nor updating).
227
232 -* nd/branch-error-cases (2013-02-23) 1 commit
233 - (merged to 'next' on 2013-03-19 at 17834dd)
234 - + branch: segfault fixes and validation
228
236 - Originally merged to 'next' on 2013-02-25
229 +* pw/p4-symlinked-root (2013-03-11) 3 commits
230 + (merged to 'next' on 2013-03-19 at 9127e82)
231 + + git p4: avoid expanding client paths in chdir
232 + + git p4 test: should honor symlink in p4 client root
233 + + git p4 test: make sure P4CONFIG relative path works
234
238 - "git branch" had more cases where it did not bother to check
239 - nonsense command line parameters.
235 + Originally merged to 'next' on 2013-03-12
236
237 + "git p4" did not behave well when the path to the root of the P4
238 + client was not its real path.
239
242 -* nd/count-garbage (2013-02-15) 4 commits
243 - (merged to 'next' on 2013-03-19 at cf6fa47)
244 - + count-objects: report how much disk space taken by garbage files
245 - + count-objects: report garbage files in pack directory too
246 - + sha1_file: reorder code in prepare_packed_git_one()
247 - + git-count-objects.txt: describe each line in -v output
240 +--------------------------------------------------
241 +[New Topics]
242
249 - Originally merged to 'next' on 2013-02-17
243 +* jc/apply-ws-fix-tab-in-indent (2013-03-22) 1 commit
244 + - apply --whitespace=fix: avoid running over the postimage buffer
245
251 - "git count-objects -v" did not count leftover temporary packfiles
252 - and other kinds of garbage.
246
247 +* jk/no-more-self-assignment (2013-03-25) 2 commits
248 + (merged to 'next' on 2013-03-26 at 31ec9ac)
249 + + match-trees: simplify score_trees() using tree_entry()
250 + + submodule: clarify logic in show_submodule_summary
251
255 -* nd/doc-index-format (2013-02-23) 3 commits
256 - (merged to 'next' on 2013-02-26 at 4d3caea)
257 - + update-index: list supported idx versions and their features
258 - + read-cache.c: use INDEX_FORMAT_{LB,UB} in verify_hdr()
259 - + index-format.txt: mention of v4 is missing in some places
252 + This started as a topic to reduce "type var = var" self assignment
253 + tricks that were used to squelch "variable used uninitialized perhaps?"
254 + warning from some compilers, but resulted in rewriting logic with
255 + a version that is simpler and easier to understand for humans.
256
261 - Originally merged to 'next' on 2013-02-26
257
263 - Update the index format documentation to mention the v4 format.
258 +* jk/t7800-modernize (2013-03-23) 3 commits
259 + - t7800: run --dir-diff tests with and without symlinks
260 + - t7800: fix tests when difftool uses --no-symlinks
261 + - t7800: don't hide grep output
262
263 + Looked reasonable standalone; conflicts with other topics in flight
264 + needs to be resolved carefully, though.
265
266 -* nd/index-pack-l10n-buf-overflow (2013-03-16) 1 commit
267 - (merged to 'next' on 2013-03-19 at 01f0223)
268 - + index-pack: fix buffer overflow caused by translations
266
270 - Originally merged to 'next' on 2013-03-18
267 +* kk/revwalk-slop-too-many-commit-within-a-second (2013-03-22) 1 commit
268 + (merged to 'next' on 2013-03-26 at ea90e75)
269 + + Fix revision walk for commits with the same dates
270
271 + Allow the revision "slop" code to look deeper while commits with
272 + exactly the same timestamps come next to each other (which can
273 + often happen after a large "am" and "rebase" session).
274
273 -* nd/preallocate-hash (2013-03-16) 1 commit
274 - (merged to 'next' on 2013-03-19 at b92f720)
275 - + Preallocate hash tables when the number of inserts are known in advance
275
277 - Originally merged to 'next' on 2013-03-18
276 +* yd/use-test-config-unconfig (2013-03-25) 12 commits
277 + - t7600: use test_config to set/unset git config variables
278 + - t7502: remove clear_config
279 + - t7502: use test_config to set/unset git config variables
280 + - t9500: use test_config to set/unset git config variables
281 + - t7508: use test_config to set/unset git config variables
282 + - t7500: use test_config to set/unset git config variables
283 + - t5541: use test_config to set/unset git config variables
284 + - t5520: use test_config to set/unset git config variables
285 + - t4202: use test_config/test_unconfig to set/unset git config variables
286 + - t4034: use test_config/test_unconfig to set/unset git config variables
287 + - t4304: use test_config to set/unset git config variables
288 + - t3400: use test_config to set/unset git config variables
289
279 - When we know approximately how many entries we will have in the
280 - hash-table, it makes sense to size the hash table to that number
281 - from the beginning to avoid unnecessary rehashing.
290 + Bulk-update of the test suite.
291
292
284 -* ob/imap-send-ssl-verify (2013-02-20) 1 commit
285 - (merged to 'next' on 2013-03-19 at 81aaed2)
286 - + imap-send: support Server Name Indication (RFC4366)
293 +* ap/combine-diff-coalesce-lost (2013-03-25) 1 commit
294 + - combine-diff: coalesce lost lines optimally
295 + (this branch uses ap/combine-diff-ignore-whitespace.)
296
288 - Originally merged to 'next' on 2013-02-25
297 + Attempts to minimize "diff -c/--cc" output by coalescing the same
298 + lines removed from the parents better, but with an O(n^2)
299 + complexity. I wonder
300
290 - Correctly connect to SSL/TLS sites that serve multiple hostnames on
291 - a single IP by including Server Name Indication in the client-hello.
301
302 +* bk/document-commit-tree-S (2013-03-25) 1 commit
303 + (merged to 'next' on 2013-03-26 at 8ee205f)
304 + + commit-tree: document -S option consistently
305
294 -* rj/msvc-build (2013-02-25) 5 commits
295 - (merged to 'next' on 2013-02-26 at 7493068)
296 - + msvc: avoid collisions between "tags" and "TAGS"
297 - + msvc: test-svn-fe: Fix linker "unresolved external" error
298 - + msvc: Fix build by adding missing symbol defines
299 - + msvc: git-daemon: Fix linker "unresolved external" errors
300 - + msvc: Fix compilation errors caused by poll.h emulation
306 + Will merge to 'master'.
307
302 - Originally merged to 'next' on 2013-02-26
308
309 +* jk/check-corrupt-objects-carefully (2013-03-25) 9 commits
310 + - clone: run check_everything_connected
311 + - clone: die on errors from unpack_trees
312 + - add tests for cloning corrupted repositories
313 + - streaming_write_entry: propagate streaming errors
314 + - add test for streaming corrupt blobs
315 + - avoid infinite loop in read_istream_loose
316 + - read_istream_filtered: propagate read error from upstream
317 + - check_sha1_signature: check return value from read_istream
318 + - stream_blob_to_fd: detect errors reading from stream
319
305 -* rs/zip-compresssed-size-with-export-subst (2013-02-27) 1 commit
306 - (merged to 'next' on 2013-03-19 at 3d2ff88)
307 - + archive-zip: fix compressed size for stored export-subst files
308 - (this branch is used by rs/archive-zip-raw-compression.)
320 + Have the streaming interface and other codepaths more carefully
321 + examine for corrupt objects.
322
310 - Originally merged to 'next' on 2013-03-03
323
312 - When export-subst is used, "zip" output recorded incorrect
313 - size of the file.
324 +* js/iterm-is-on-osx (2013-03-25) 1 commit
325 + - git-web--browse: recognize iTerm as a GUI terminal on OS X
326
327 + Add more logic to detect graphic environment of OS X.
328
316 -* rt/commit-cleanup-config (2013-02-23) 1 commit
317 - (merged to 'next' on 2013-03-19 at 846cf01)
318 - + t7502: perform commits using alternate editor in a subshell
329
320 - Originally merged to 'next' on 2013-02-25
330 +* tb/cygwin-shared-repository (2013-03-25) 2 commits
331 + - optimize set_shared_perm()
332 + - Make core.sharedRepository work under cygwin 1.7
333
322 - Fix tests that contaminated their environments and affected new
323 - tests introduced later in the sequence by containing their effects
324 - in their own subshells.
334 + Cygwin port has a faster-but-lying lstat(2) emulation whose
335 + incorrectness does not matter in practice except for a few
336 + codepaths, and setting permission bits to directories is a codepath
337 + that needs to use a more correct one.
338
339
327 -* tb/document-status-u-tradeoff (2013-03-16) 2 commits
328 - (merged to 'next' on 2013-03-19 at 01573b6)
329 - + status: advise to consider use of -u when read_directory takes too long
330 - + git status: document trade-offs in choosing parameters to the -u option
340 +* jc/directory-attrs-regression-fix (2013-03-26) 4 commits
341 + - make sure a pattern without trailing slash matches a directory
342 + - attr.c::path_matches(): special case paths that end with a slash
343 + - dir.c::match_basename(): pay attention to the length of string parameters
344 + - attr.c::path_matches(): the basename is part of the pathname
345
332 - Originally merged to 'next' on 2013-03-18
346 + Fix 1.8.1.x regression that stopped matching "dir" (without
347 + trailing slash) to a directory "dir".
348
334 - Suggest users to look into using--untracked=no option when "git
335 - status" takes too long.
349
350 +* nd/checkout-paths-reduce-match-pathspec-calls (2013-03-26) 1 commit
351 + - [NEEDSTEST] checkout: avoid unnecessary match_pathspec calls
352
338 -* tk/doc-filter-branch (2013-02-26) 2 commits
339 - (merged to 'next' on 2013-02-26 at bd4638b)
340 - + Documentation: filter-branch env-filter example
341 - + git-filter-branch.txt: clarify ident variables usage
353 +--------------------------------------------------
354 +[Stalled]
355
343 - Originally merged to 'next' on 2013-02-26
356 +* jc/format-patch (2013-02-21) 2 commits
357 + - format-patch: --inline-single
358 + - format-patch: rename "no_inline" field
359
360 + A new option to send a single patch to the standard output to be
361 + appended at the bottom of a message. I personally have no need for
362 + this, but it was easy enough to cobble together. Tests, docs and
363 + stripping out more MIMEy stuff are left as exercises to interested
364 + parties.
365
346 -* tz/credential-authinfo (2013-02-25) 1 commit
347 - (merged to 'next' on 2013-03-19 at 1a68953)
348 - + Add contrib/credentials/netrc with GPG support
366 + Not ready for inclusion.
367
350 - Originally merged to 'next' on 2013-02-27
368
352 - A new read-only credential helper (in contrib/) to interact with
353 - the .netrc/.authinfo files. Hopefully mn/send-email-authinfo topic
354 - can rebuild on top of something like this.
369 +* mg/qnx6 (2013-02-25) 1 commit
370 + - QNX: newer QNX 6.x.x is not so crippled
371
372 + Not ready for inclusion.
373
357 -* we/submodule-update-prefix-output (2013-03-03) 1 commit
358 - (merged to 'next' on 2013-03-19 at a818063)
359 - + submodule update: when using recursion, show full path
374
361 - Originally merged to 'next' on 2013-03-04
375 +* po/help-guides (2013-03-03) 5 commits
376 + - help doc: include --guide option description
377 + - help.c: add list_common_guides_help() function
378 + - help.c: add --guide option
379 + - help.c: use OPT_COUNTUP
380 + - show 'git help <guide>' usage, with examples
381
363 - "git submodule update", when recursed into sub-submodules, did not
364 - acccumulate the prefix paths.
382 + Give more visibility to "concept guides" to help "git help" users.
383
384 + Expecting a reroll.
385 + $gmane/217384
386
367 -* wk/doc-pre-rebase (2013-02-24) 1 commit
368 - (merged to 'next' on 2013-02-25 at a6ec310)
369 - + Documentation/githooks: Explain pre-rebase parameters
387
371 - Originally merged to 'next' on 2013-02-25
388 +* hv/config-from-strbuf (2013-03-10) 4 commits
389 + - teach config parsing to read from strbuf
390 + - config: make parsing stack struct independent from actual data source
391 + - config: drop file pointer validity check in get_next_char()
392 + - config: factor out config file stack management
393 +
394 + Expecting a reroll.
395 + $gmane/217811
396 +
397 +
398 +* mb/gitweb-highlight-link-target (2012-12-20) 1 commit
399 + - Highlight the link target line in Gitweb using CSS
400 +
401 + Expecting a reroll.
402 + $gmane/211935
403 +
404 +
405 +* mb/remote-default-nn-origin (2012-07-11) 6 commits
406 + - Teach get_default_remote to respect remote.default.
407 + - Test that plain "git fetch" uses remote.default when on a detached HEAD.
408 + - Teach clone to set remote.default.
409 + - Teach "git remote" about remote.default.
410 + - Teach remote.c about the remote.default configuration setting.
411 + - Rename remote.c's default_remote_name static variables.
412
413 + When the user does not specify what remote to interact with, we
414 + often attempt to use 'origin'. This can now be customized via a
415 + configuration variable.
416
374 -* wk/user-manual-literal-format (2013-02-25) 1 commit
375 - (merged to 'next' on 2013-02-26 at d59ce38)
376 - + user-manual: Standardize backtick quoting
417 + Expecting a reroll.
418 + $gmane/210151
419
378 - Originally merged to 'next' on 2013-02-26
420 + "The first remote becomes the default" bit is better done as a
421 + separate step.
422
423 --------------------------------------------------
381 -[New Topics]
424 +[Cooking]
425
426 * jc/merge-tag-object (2013-03-19) 1 commit
427 - merge: a random object may not necssarily be a commit
@@ -441,17 +484,10 @@ of the repositories listed at
484
485
486 * rr/tests-dedup-test-config (2013-03-19) 1 commit
444 - - t4018,7810,7811: remove test_config() redefinition
445 -
446 - Will merge to 'next'.
447 -
448 -
449 -* ja/directory-attrs (2013-03-20) 1 commit
450 - - trailing slash required in .gitattributes
487 + (merged to 'next' on 2013-03-26 at d314299)
488 + + t4018,7810,7811: remove test_config() redefinition
489
452 - Expose but not fix a recent regression that started not matching a
453 - directory "sub" with gitattributes pattern "sub" (without trailing
454 - slash).
490 + Will merge to 'master'.
491
492
493 * jn/add-2.0-u-A-sans-pathspec (2013-03-20) 5 commits
@@ -467,191 +503,96 @@ of the repositories listed at
503
504
505 * rr/test-3200-style (2013-03-20) 1 commit
470 - - t3200 (branch): modernize style
506 + (merged to 'next' on 2013-03-26 at 1214287)
507 + + t3200 (branch): modernize style
508
509 Churns.
510
474 - Will merge to 'next'.
511 + Will merge to 'master'.
512
513
477 -* tr/packed-object-info-wo-recursion (2013-03-20) 1 commit
514 +* tr/packed-object-info-wo-recursion (2013-03-25) 3 commits
515 + - sha1_file: remove recursion in unpack_entry
516 + - Refactor parts of in_delta_base_cache/cache_or_unpack_entry
517 - sha1_file: remove recursion in packed_object_info
518
519 Attempts to reduce the stack footprint of sha1_object_info()
481 - codepath.
520 + and unpack_entry() codepaths.
521
522
523 * sr/am-show-final-message-in-applying-indicator (2013-03-21) 1 commit
485 - - git-am: show the final log message on "Applying:" indicator
486 -
487 -
488 -* yd/doc-merge-annotated-tag (2013-03-21) 1 commit
489 - - Documentation: merging a tag is a special case
490 -
491 -
492 -* yd/doc-is-in-asciidoc (2013-03-21) 1 commit
493 - - CodingGuidelines: our documents are in AsciiDoc
494 -
495 ---------------------------------------------------
496 -[Stalled]
497 -
498 -* jc/format-patch (2013-02-21) 2 commits
499 - - format-patch: --inline-single
500 - - format-patch: rename "no_inline" field
501 -
502 - A new option to send a single patch to the standard output to be
503 - appended at the bottom of a message. I personally have no need for
504 - this, but it was easy enough to cobble together. Tests, docs and
505 - stripping out more MIMEy stuff are left as exercises to interested
506 - parties.
507 -
508 - Not ready for inclusion.
509 -
510 -
511 -* mg/qnx6 (2013-02-25) 1 commit
512 - - QNX: newer QNX 6.x.x is not so crippled
513 -
514 - Not ready for inclusion.
515 -
516 -
517 -* po/help-guides (2013-03-03) 5 commits
518 - - help doc: include --guide option description
519 - - help.c: add list_common_guides_help() function
520 - - help.c: add --guide option
521 - - help.c: use OPT_COUNTUP
522 - - show 'git help <guide>' usage, with examples
523 -
524 - Give more visibility to "concept guides" to help "git help" users.
525 -
526 - Expecting a reroll.
527 - $gmane/217384
528 -
529 -
530 -* hv/config-from-strbuf (2013-03-10) 4 commits
531 - - teach config parsing to read from strbuf
532 - - config: make parsing stack struct independent from actual data source
533 - - config: drop file pointer validity check in get_next_char()
534 - - config: factor out config file stack management
524 + (merged to 'next' on 2013-03-26 at 9ecb143)
525 + + git-am: show the final log message on "Applying:" indicator
526
536 - Expecting a reroll.
537 - $gmane/217811
527 + In addition to the case where the user edits the log message with
528 + the "e)dit" option of "am -i", replace the "Applying: this patch"
529 + message with the final log message contents after applymsg hook
530 + munges it.
531
532 + Will merge to 'master'.
533
540 -* mb/gitweb-highlight-link-target (2012-12-20) 1 commit
541 - - Highlight the link target line in Gitweb using CSS
534
543 - Expecting a reroll.
544 - $gmane/211935
535 +* yd/doc-merge-annotated-tag (2013-03-21) 1 commit
536 + (merged to 'next' on 2013-03-26 at a11162f)
537 + + Documentation: merging a tag is a special case
538
539 + Document the 1.7.9 feature to merge a signed tag and keep that in
540 + the mergetag header in the resulting commit better.
541
547 -* mb/remote-default-nn-origin (2012-07-11) 6 commits
548 - - Teach get_default_remote to respect remote.default.
549 - - Test that plain "git fetch" uses remote.default when on a detached HEAD.
550 - - Teach clone to set remote.default.
551 - - Teach "git remote" about remote.default.
552 - - Teach remote.c about the remote.default configuration setting.
553 - - Rename remote.c's default_remote_name static variables.
542 + Will merge to 'master'.
543
555 - When the user does not specify what remote to interact with, we
556 - often attempt to use 'origin'. This can now be customized via a
557 - configuration variable.
544
559 - Expecting a reroll.
560 - $gmane/210151
545 +* yd/doc-is-in-asciidoc (2013-03-21) 1 commit
546 + (merged to 'next' on 2013-03-26 at a980af2)
547 + + CodingGuidelines: our documents are in AsciiDoc
548
562 - "The first remote becomes the default" bit is better done as a
563 - separate step.
549 + Will merge to 'master'.
550
565 ---------------------------------------------------
566 -[Cooking]
551
552 * ap/combine-diff-ignore-whitespace (2013-03-14) 1 commit
553 (merged to 'next' on 2013-03-19 at dfb2c98)
554 + Allow combined diff to ignore white-spaces
555 + (this branch is used by ap/combine-diff-coalesce-lost.)
556
557 Originally merged to 'next' on 2013-03-18
558
574 - Teach "diff --cc" output to honor options to ignore various forms
575 - of whitespace changes.
576 -
577 - Will merge to 'master' in the 4th batch (Safe).
578 -
579 -
580 -* jk/checkout-attribute-lookup (2013-03-20) 3 commits
581 - (merged to 'next' on 2013-03-20 at 43a89e8)
582 - + t2003: work around path mangling issue on Windows
583 - (merged to 'next' on 2013-03-19 at b063a55)
584 - + entry: fix filter lookup
585 - + t2003: modernize style
586 -
587 - Originally merged to 'next' on 2013-03-15
588 -
589 - Codepath to stream blob object contents directly from the object
590 - store to filesystem did not use the correct path to find conversion
591 - filters when writing to temporary files.
592 -
593 - Will merge to 'master' in the 4th batch (Safe).
594 -
595 -
596 -* jk/difftool-dir-diff-edit-fix (2013-03-14) 3 commits
597 - (merged to 'next' on 2013-03-19 at e68014a)
598 - + difftool --dir-diff: symlink all files matching the working tree
599 - + difftool: avoid double slashes in symlink targets
600 - + git-difftool(1): fix formatting of --symlink description
601 -
602 - Originally merged to 'next' on 2013-03-15
603 -
604 - "git difftool --dir-diff" made symlinks to working tree files when
605 - preparing a temporary directory structure, so that accidental edits
606 - of these files in the difftool are reflected back to the working
607 - tree, but the logic to decide when to do so was not quite right.
608 -
609 - Will merge to 'master' in the 4th batch (Safe).
610 -
611 -
612 -* lf/setup-prefix-pathspec (2013-03-14) 2 commits
613 - (merged to 'next' on 2013-03-19 at 0017e9e)
614 - + setup.c: check that the pathspec magic ends with ")"
615 - + setup.c: stop prefix_pathspec() from looping past the end of string
616 -
617 - Originally merged to 'next' on 2013-03-14
618 -
619 - "git cmd -- ':(top'" was not diagnosed as an invalid syntax, and
620 - instead the parser kept reading beyond the end of the string.
621 -
622 - Will merge to 'master' in the 3rd batch (Safe).
623 -
624 -
625 -* jk/fully-peeled-packed-ref (2013-03-18) 4 commits
626 - (merged to 'next' on 2013-03-19 at fa92bc7)
627 - + pack-refs: add fully-peeled trait
628 - + pack-refs: write peeled entry for non-tags
629 - + use parse_object_or_die instead of die("bad object")
630 - + avoid segfaults on parse_object failure
559 + Teach "diff --cc" output to honor options to ignore various forms
560 + of whitespace changes.
561
632 - Originally merged to 'next' on 2013-03-18
562 + Will merge to 'master' in the 4th batch (Safe).
563
634 - Not that we do not actively encourage having annotated tags outside
635 - refs/tags/ hierarchy, but they were not advertised correctly to the
636 - ls-remote and fetch with recent version of Git.
564
638 - Will merge to 'master' in the 3rd batch (Safe).
565 +* jk/checkout-attribute-lookup (2013-03-20) 3 commits
566 + (merged to 'next' on 2013-03-20 at 43a89e8)
567 + + t2003: work around path mangling issue on Windows
568 + (merged to 'next' on 2013-03-19 at b063a55)
569 + + entry: fix filter lookup
570 + + t2003: modernize style
571 +
572 + Codepath to stream blob object contents directly from the object
573 + store to filesystem did not use the correct path to find conversion
574 + filters when writing to temporary files.
575 +
576 + Will merge to 'master' in the 4th batch (Safe).
577
578
641 -* jk/peel-ref (2013-03-16) 3 commits
642 - (merged to 'next' on 2013-03-19 at f0d4c16)
643 - + upload-pack: load non-tip "want" objects from disk
644 - + upload-pack: make sure "want" objects are parsed
645 - + upload-pack: drop lookup-before-parse optimization
579 +* jk/difftool-dir-diff-edit-fix (2013-03-14) 3 commits
580 + (merged to 'next' on 2013-03-19 at e68014a)
581 + + difftool --dir-diff: symlink all files matching the working tree
582 + + difftool: avoid double slashes in symlink targets
583 + + git-difftool(1): fix formatting of --symlink description
584
647 - Originally merged to 'next' on 2013-03-18
585 + Originally merged to 'next' on 2013-03-15
586
649 - Recent optimization broke shallow clones.
587 + "git difftool --dir-diff" made symlinks to working tree files when
588 + preparing a temporary directory structure, so that accidental edits
589 + of these files in the difftool are reflected back to the working
590 + tree, but the logic to decide when to do so was not quite right.
591
651 - Will merge to 'master' in the 3rd batch (Safe).
592 + Will merge to 'master' in the 4th batch (Safe).
593
594
654 -* nd/magic-pathspecs (2013-03-21) 46 commits
595 +* nd/magic-pathspecs (2013-03-22) 46 commits
596 - fixup
597 - Rename field "raw" to "_raw" in struct pathspec
598 - pathspec: support :(glob) syntax
@@ -701,17 +642,7 @@ of the repositories listed at
642
643 Migrate the rest of codebase to use "struct pathspec" more.
644
704 -
705 -* pe/pull-rebase-v-q (2013-03-16) 1 commit
706 - (merged to 'next' on 2013-03-19 at 10b311c)
707 - + pull: Apply -q and -v options to rebase mode as well
708 -
709 - Originally merged to 'next' on 2013-03-18
710 -
711 - Teach "git pull --rebase" to pass "-v/-q" command line options to
712 - underlying "git rebase".
713 -
714 - Will merge to 'master' in the 2nd batch (Safe).
645 + Haven't picked up the reroll yet.
646
647
648 * rs/archive-zip-raw-compression (2013-03-16) 1 commit
@@ -723,103 +654,23 @@ of the repositories listed at
654 Will merge to 'master' in the 4th batch (Safe).
655
656
726 -* jk/fast-export-object-lookup (2013-03-17) 2 commits
727 - (merged to 'next' on 2013-03-19 at 026ac3d)
728 - + fast-export: do not load blob objects twice
729 - + fast-export: rename handle_object function
730 -
731 - Originally merged to 'next' on 2013-03-18
732 -
733 - Will merge to 'master' in the 3rd batch (Safe).
734 -
735 -
657 * sw/safe-create-leading-dir-race (2013-03-17) 2 commits
658 - SQUASH???
659 - safe_create_leading_directories: fix race that could give a false negative
660
740 - Waiting for response to review comments.
741 -
742 -
743 -* ph/tag-force-no-warn-on-creation (2013-03-13) 1 commit
744 - (merged to 'next' on 2013-03-19 at b273fd3)
745 - + tag: --force does not have to warn when creating tags
746 -
747 - Originally merged to 'next' on 2013-03-14
748 -
749 - "git tag -f <tag>" always said "Updated tag '<tag>'" even when
750 - creating a new tag (i.e. not overwriting nor updating).
661 + Will merge to 'next' after squashing in the fix.
662
752 - Will merge to 'master' in the 3rd batch (Safe).
663
754 -
755 -* nd/branch-show-rebase-bisect-state (2013-03-16) 6 commits
664 +* nd/branch-show-rebase-bisect-state (2013-03-23) 7 commits
665 + - status, branch: fix the misleading "bisecting" message
666 - branch: show more information when HEAD is detached
667 - status: show more info than "currently not on any branch"
668 - wt-status: move wt_status_get_state() out to wt_status_print()
669 - wt-status: split wt_status_state parsing function out
670 - wt-status: move strbuf into read_and_strip_branch()
671 - Merge branch 'jc/reflog-reverse-walk' into nd/branch-show-rebase-bisect-state
762 - (this branch uses jc/reflog-reverse-walk.)
763 -
764 - Originally merged to 'next' on 2013-03-18
765 -
766 - The "biseting X" display is iffy.
767 -
768 -
769 -* kb/p4merge (2013-03-13) 2 commits
770 - (merged to 'next' on 2013-03-19 at 43cc599)
771 - + mergetools/p4merge: create a base if none available
772 - + mergetools/p4merge: swap LOCAL and REMOTE
773 -
774 - Originally merged to 'next' on 2013-03-14
775 -
776 - Adjust the order mergetools feeds the files to the p4merge backend
777 - to match the p4 convention.
778 -
779 - Will merge to 'master' in the 3rd batch (Safe).
780 -
781 -
782 -* jc/reflog-reverse-walk (2013-03-08) 3 commits
783 - (merged to 'next' on 2013-03-19 at 25beb2a)
784 - + reflog: add for_each_reflog_ent_reverse() API
785 - + for_each_recent_reflog_ent(): simplify opening of a reflog file
786 - + for_each_reflog_ent(): extract a helper to process a single entry
787 - (this branch is used by nd/branch-show-rebase-bisect-state.)
788 -
789 - Originally merged to 'next' on 2013-03-14
790 -
791 - An internal function used to implement "git checkout @{-1}" was
792 - hard to use correctly.
793 -
794 - Will merge to 'master' in the 3rd batch (Safe).
795 -
796 -
797 -* jk/alias-in-bare (2013-03-08) 3 commits
798 - (merged to 'next' on 2013-03-19 at d2b4227)
799 - + setup: suppress implicit "." work-tree for bare repos
800 - + environment: add GIT_PREFIX to local_repo_env
801 - + cache.h: drop LOCAL_REPO_ENV_SIZE
802 -
803 - Originally merged to 'next' on 2013-03-09
804 -
805 - An aliased command spawned from a bare repository that does not say
806 - it is bare with "core.bare = yes" is treated as non-bare by mistake.
807 -
808 - Will merge to 'master' in the 3rd batch (Safe).
809 -
810 -
811 -* pw/p4-symlinked-root (2013-03-11) 3 commits
812 - (merged to 'next' on 2013-03-19 at 9127e82)
813 - + git p4: avoid expanding client paths in chdir
814 - + git p4 test: should honor symlink in p4 client root
815 - + git p4 test: make sure P4CONFIG relative path works
816 -
817 - Originally merged to 'next' on 2013-03-12
818 -
819 - "git p4" did not behave well when the path to the root of the P4
820 - client was not its real path.
672
822 - Will merge to 'master' in the 3rd batch (Safe).
673 + Will merge to 'next'.
674
675
676 * jc/add-2.0-delete-default (2013-03-08) 3 commits
@@ -827,8 +678,6 @@ of the repositories listed at
678 - git add: start preparing for "git add <pathspec>..." to default to "-A"
679 - builtin/add.c: simplify boolean variables
680
830 - Originally merged to 'next' on 2013-03-14
831 -
681 "git add dir/" updated modified files and added new files, but does
682 not notice removed files, which may be "Huh?" to some users. They
683 can of course use "git add -A dir/", but why should they?
@@ -840,25 +689,9 @@ of the repositories listed at
689 Will cook in 'next' until Git 2.0.
690
691
843 -* jk/empty-archive (2013-03-10) 2 commits
844 - (merged to 'next' on 2013-03-19 at bb4eb61)
845 - + archive: handle commits with an empty tree
846 - + test-lib: factor out $GIT_UNZIP setup
847 -
848 - Originally merged to 'next' on 2013-03-12
849 -
850 - "git archive" reports a failure when asked to create an archive out
851 - of an empty tree. It would be more intuitive to give an empty
852 - archive back in such a case.
853 -
854 - Will merge to 'master' in the 3rd batch (Safe).
855 -
856 -
692 * jc/nobody-sets-src-peer-ref (2013-03-04) 1 commit
693 - match_push_refs(): nobody sets src->peer_ref anymore
694
860 - Originally merged to 'next' on 2013-03-07
861 -
695 Dead code removal.
696
697 Even though I think this change is correct, please report
@@ -867,51 +700,9 @@ of the repositories listed at
700 Will merge to 'master' in the 4th batch (Risky).
701
702
870 -* jc/push-follow-tag (2013-03-05) 4 commits
871 - (merged to 'next' on 2013-03-19 at d302a10)
872 - + push: --follow-tags
873 - + commit.c: use clear_commit_marks_many() in in_merge_bases_many()
874 - + commit.c: add in_merge_bases_many()
875 - + commit.c: add clear_commit_marks_many()
876 -
877 - Originally merged to 'next' on 2013-03-09
878 -
879 - The new "--follow-tags" option tells "git push" to push relevant
880 - annotated tags when pushing branches out.
881 -
882 - Will merge to 'master' in the 3rd batch (Safe).
883 -
884 -
885 -* jc/maint-reflog-expire-clean-mark-typofix (2013-03-05) 1 commit
886 - (merged to 'next' on 2013-03-19 at a4f9eac)
887 - + reflog: fix typo in "reflog expire" clean-up codepath
888 -
889 - Originally merged to 'next' on 2013-03-07
890 -
891 - In "git reflog expire", REACHABLE bit was not cleared from the
892 - correct objects.
893 -
894 - Will merge to 'master' in the 3rd batch (Safe).
895 -
896 -
897 -* ks/rfc2047-one-char-at-a-time (2013-03-09) 1 commit
898 - (merged to 'next' on 2013-03-19 at 577ddf2)
899 - + format-patch: RFC 2047 says multi-octet character may not be split
900 -
901 - Originally merged to 'next' on 2013-03-09
902 -
903 - When "format-patch" quoted a non-ascii strings on the header files,
904 - it incorrectly applied rfc2047 and chopped a single character in
905 - the middle of it.
906 -
907 - Will merge to 'master' in the 3rd batch (Safe).
908 -
909 -
703 * kb/name-hash (2013-02-27) 1 commit
704 - name-hash.c: fix endless loop with core.ignorecase=true
705
913 - Originally merged to 'next' on 2013-03-05
914 -
706 The code to keep track of what directory names are known to Git on
707 platforms with case insensitive filesystems can get confused upon
708 a hash collision between these pathnames and looped forever.
@@ -922,24 +713,7 @@ of the repositories listed at
713 Will merge to 'master' in the 4th batch (Risky).
714
715
925 -* jc/describe (2013-02-28) 1 commit
926 - (merged to 'next' on 2013-03-19 at 89e6e47)
927 - + describe: --match=<pattern> must limit the refs even when used with --all
928 -
929 - Originally merged to 'next' on 2013-03-05
930 -
931 - The "--match=<pattern>" option of "git describe", when used with
932 - "--all" to allow refs that are not annotated tags to be used as a
933 - base of description, did not restrict the output from the command
934 - to those that match the given pattern.
935 -
936 - We may want to have a looser matching that does not restrict to tags,
937 - but that can be done as a follow-up topic; this step is purely a bugfix.
938 -
939 - Will merge to 'master' in the 3rd batch (Safe).
940 -
941 -
942 -* tr/line-log (2013-03-21) 6 commits
716 +* tr/line-log (2013-03-23) 6 commits
717 - Speed up log -L... -M
718 - log -L: :pattern:file syntax to find by funcname
719 - Implement line-history search (git log -L)
@@ -948,29 +722,11 @@ of the repositories listed at
722 - Refactor parse_loc
723
724 Rerolled; collides with nd/magic-pathspecs.
951 - Does not seem to pass its own test (t4211-line-log.sh).
952 -
953 -
954 -* ap/maint-diff-rename-avoid-overlap (2013-03-06) 3 commits
955 - (merged to 'next' on 2013-03-19 at c3276cf)
956 - + tests: make sure rename pretty print works
957 - + diff: prevent pprint_rename from underrunning input
958 - + diff: Fix rename pretty-print when suffix and prefix overlap
959 -
960 - Originally merged to 'next' on 2013-03-06
961 -
962 - The logic used by "git diff -M --stat" to shorten the names of
963 - files before and after a rename did not work correctly when the
964 - common prefix and suffix between the two filenames overlapped.
965 -
966 - Will merge to 'master' in the 3rd batch (Safe).
725
726
727 * jk/common-make-variables-export-safety (2013-02-25) 1 commit
728 - Makefile: make mandir, htmldir and infodir absolute
729
972 - Originally merged to 'next' on 2013-03-05
973 -
730 Make the three variables safer to be exported to submakes by
731 ensuring that they are full paths so that they can be used as
732 installation location.
@@ -981,27 +737,6 @@ of the repositories listed at
737 Will merge to 'master' in the 4th batch (Risky).
738
739
984 -* jk/suppress-clang-warning (2013-02-25) 1 commit
985 - (merged to 'next' on 2013-03-19 at 1fd6858)
986 - + fix clang -Wtautological-compare with unsigned enum
987 -
988 - Originally merged to 'next' on 2013-03-14
989 -
990 - Will merge to 'master' in the 3rd batch (Safe).
991 -
992 -
993 -* mg/unsigned-time-t (2013-02-25) 2 commits
994 - (merged to 'next' on 2013-03-19 at 1fc1ad6)
995 - + Fix time offset calculation in case of unsigned time_t
996 - + date.c: fix unsigned time_t comparison
997 -
998 - Originally merged to 'next' on 2013-03-14
999 -
1000 - A few workarounds for systems with unsigned time_t.
1001 -
1002 - Will merge to 'master' in the 3rd batch (Safe).
1003 -
1004 -
740 * jk/pkt-line-cleanup (2013-03-21) 20 commits
741 - do not use GIT_TRACE_PACKET=3 in tests
742 - remote-curl: always parse incoming refs
@@ -1024,8 +759,6 @@ of the repositories listed at
759 - upload-pack: do not add duplicate objects to shallow list
760 - upload-pack: use get_sha1_hex to parse "shallow" lines
761
1027 - Originally merged to 'next' on 2013-02-25
1028 -
762 Cleans up pkt-line API, implementation and its callers to make them
763 more robust. Even though I think this change is correct, please
764 report immediately if you find any unintended side effect.
@@ -1033,26 +766,11 @@ of the repositories listed at
766 Will merge to 'master' in the 3rd batch (Risky).
767
768
1036 -* jl/submodule-deinit (2013-03-04) 1 commit
1037 - (merged to 'next' on 2013-03-19 at d8367c5)
1038 - + submodule: add 'deinit' command
1039 -
1040 - Originally merged to 'next' on 2013-03-05
1041 -
1042 - There was no Porcelain way to say "I no longer am interested in
1043 - this submodule", once you express your interest in a submodule with
1044 - "submodule init". "submodule deinit" is the way to do so.
1045 -
1046 - Will merge to 'master' in the 3rd batch (Safe).
1047 -
1048 -
769 * jc/remove-export-from-config-mak-in (2013-03-05) 3 commits
770 - Fix `make install` when configured with autoconf
771 - Makefile: do not export mandir/htmldir/infodir
772 - config.mak.in: remove unused definitions
773
1054 - Originally merged to 'next' on 2013-03-05
1055 -
774 config.mak.in template had an "export" line to cause a few
775 common makefile variables to be exported; if they need to be
776 expoted for autoconf/configure users, they should also be exported
@@ -1071,8 +789,6 @@ of the repositories listed at
789 * jc/remove-treesame-parent-in-simplify-merges (2013-01-17) 1 commit
790 - simplify-merges: drop merge from irrelevant side branch
791
1074 - Originally merged to 'next' on 2013-01-30
1075 -
792 The --simplify-merges logic did not cull irrelevant parents from a
793 merge that is otherwise not interesting with respect to the paths
794 we are following.
@@ -1101,8 +817,6 @@ of the repositories listed at
817 - t5505: do not assume the "matching" push is the default
818 - t5404: do not assume the "matching" push is the default
819
1104 - Originally merged to 'next' on 2013-03-18
1105 -
820 Will cook in 'next' until Git 2.0.
821
822
@@ -1121,8 +835,6 @@ of the repositories listed at
835 - commit, cherry-pick -s: remove broken support for multiline rfc2822 fields
836 - sequencer.c: rework search for start of footer to improve clarity
837
1124 - Originally merged to 'next' on 2013-02-25
1125 -
838 Consolidates codepaths that inspect log-message-to-be and decide to
839 add a new Signed-off-by line in various commands. I think there is
840 no negative behaviour change in this series, but please report any
@@ -1148,11 +860,20 @@ of the repositories listed at
860 * jc/add-2.0-u-A-sans-pathspec (2013-03-14) 1 commit
861 . git add: -u/-A now affects the entire working tree
862
1151 - Originally merged to 'next' on 2013-03-14
1152 -
863 "git add -u/-A" without pathspec has traditonally limited its
864 operation to the current directory and its subdirectories, but in
865 Git 1.8.2 we started encouraging users to be more explicit to
866 specify "." when they mean it (and use ":/" to make it affect the
867 entire working tree). With this, we finally change the behaviour
868 and make it affect the entire working tree in Git 2.0.
869 +
870 +
871 +--------------------------------------------------
872 +[Discarded]
873 +
874 +* ja/directory-attrs (2013-03-20) 1 commit
875 + . trailing slash required in .gitattributes
876 +
877 + Now part of jc/directory-attrs-regression-fix.
878 +
879 +