1 To: git@vger.kernel.org
3 Subject: What's cooking in git.git (Dec 2014, #03; Mon, 15)
4 X-master-at: 9abc44b681a669c67d071d858c8aad21f65a0956
5 X-next-at: d6426a0ea3bc6be707b25a6817328703d4883659
7 What's cooking in git.git (Dec 2014, #03; Mon, 15)
8 --------------------------------------------------
10 Here are the topics that have been cooking. Commits prefixed with
11 '-' are only in 'pu' (proposed updates) while commits prefixed with
14 The 'next' branch has been rewound and rebuilt on top of 2.2; I
15 expect this to be a short and light cycle that would not add too
18 You can find the changes described here in the integration branches
19 of the repositories listed at
21 http://git-blame.blogspot.com/p/git-public-repositories.html
23 --------------------------------------------------
24 [Graduated to "master"]
26 * da/difftool-mergetool-simplify-reporting-status (2014-11-21) 5 commits
27 (merged to 'next' on 2014-12-04 at c3c329f)
28 + mergetools: stop setting $status in merge_cmd()
29 + mergetool: simplify conditionals
30 + difftool--helper: add explicit exit statement
31 + mergetool--lib: remove use of $status global
32 + mergetool--lib: remove no-op assignment to $status from setup_user_tool
37 * jc/unpack-trees-plug-leak (2014-11-17) 1 commit
38 (merged to 'next' on 2014-12-04 at 9f1df30)
39 + unpack_trees: plug leakage of o->result
42 * jk/colors-fix (2014-11-20) 3 commits
43 (merged to 'next' on 2014-12-04 at 0d97d69)
44 + t4026: test "normal" color
45 + config: fix parsing of "git config --get-color some.key -1"
46 + docs: describe ANSI 256-color mode
47 (this branch is used by jk/colors.)
50 * jk/no-perl-tests (2014-11-18) 2 commits
51 (merged to 'next' on 2014-12-04 at f166620)
52 + t960[34]: mark cvsimport tests as requiring perl
53 + t0090: mark add-interactive test with PERL prerequisite
55 Some tests that depend on perl lacked PERL prerequisite to protect
56 them, breaking build with NO_PERL configuration.
59 * jk/pack-bitmap (2014-11-30) 1 commit
60 (merged to 'next' on 2014-12-04 at eb457ad)
61 + pack-bitmap: do not use gcc packed attribute
64 * jk/push-simple (2014-11-30) 1 commit
65 (merged to 'next' on 2014-12-04 at 00785c7)
66 + push: truly use "simple" as default, not "upstream"
68 Git 2.0 was supposed to make the "simple" mode for the default of
69 "git push", but it didn't.
72 * jk/rebuild-perl-scripts-with-no-perl-seting-change (2014-11-18) 3 commits
73 (merged to 'next' on 2014-12-04 at 27382d3)
74 + Makefile: have python scripts depend on NO_PYTHON setting
75 + Makefile: simplify by using SCRIPT_{PERL,SH}_GEN macros
76 + Makefile: have perl scripts depend on NO_PERL setting
78 The build procedure did not bother fixing perl and python scripts
79 when NO_PERL and NO_PYTHON build-time configuration changed.
82 * mh/config-copy-string-from-git-path (2014-11-17) 1 commit
83 (merged to 'next' on 2014-12-04 at 9c9518b)
84 + cmd_config(): make a copy of path obtained from git_path()
87 * po/everyday-doc (2014-11-17) 1 commit
88 (merged to 'next' on 2014-12-04 at 39d31fb)
89 + Documentation: change "gitlink" typo in git-push
92 * rt/push-recurse-submodule-usage-string (2014-11-18) 1 commit
93 (merged to 'next' on 2014-12-04 at c43e23c)
94 + builtin/push.c: fix description of --recurse-submodules option
97 * sv/typofix-apply-error-message (2014-11-17) 1 commit
98 (merged to 'next' on 2014-12-04 at de7547a)
99 + apply: fix typo in an error message
101 --------------------------------------------------
104 * jk/test-asan (2014-12-11) 1 commit
105 (merged to 'next' on 2014-12-15 at d24cb92)
106 + t: support clang/gcc AddressSanitizer
108 Will merge to 'master'.
111 * nd/split-index (2014-12-11) 1 commit
112 (merged to 'next' on 2014-12-15 at ed6490c)
113 + index-format.txt: add a missing closing quote
115 A typofix to the documentation of a feature already in the release.
117 Will merge to 'master'.
120 * ch/new-gpg-drops-rfc-1991 (2014-12-12) 4 commits
121 (merged to 'next' on 2014-12-15 at 32d7d50)
122 + tests: squelch noise from GPG machinery set-up
123 + tests: replace binary GPG keyrings with ASCII-armored keys
124 + tests: skip RFC1991 tests for gnupg 2.1
125 + tests: create gpg homedir on the fly
127 Recent GPG changes the keyring format and drops support for RFC1991
128 formatted signatures, breaking our existing tests.
130 Will merge to 'master'.
133 * jg/prompt-localize-temporary (2014-12-12) 1 commit
134 (merged to 'next' on 2014-12-15 at bb9cac9)
135 + git-prompt.sh: make $f local to __git_eread()
137 "git-prompt" (in contrib/) used a variable from the global scope,
138 possibly contaminating end-user's namespace.
140 Will merge to 'master'.
143 * jk/strbuf-doc-to-header (2014-12-12) 4 commits
144 - strbuf.h: reorganize api function grouping headers
145 - strbuf.h: format asciidoc code blocks as 4-space indent
146 - strbuf.h: drop asciidoc list formatting from API docs
147 - strbuf: migrate api-strbuf.txt documentation to strbuf.h
149 Resolve the "doc vs header" to favor the latter.
151 Expecting to be rerolled.
154 * mh/reflog-expire (2014-12-12) 24 commits
155 - refs.c: let fprintf handle the formatting
156 - refs.c: don't expose the internal struct ref_lock in the header file
157 - lock_any_ref_for_update(): inline function
158 - refs.c: remove unlock_ref/close_ref/commit_ref from the refs api
159 - reflog_expire(): new function in the reference API
160 - expire_reflog(): treat the policy callback data as opaque
161 - Move newlog and last_kept_sha1 to "struct expire_reflog_cb"
162 - expire_reflog(): move rewrite to flags argument
163 - expire_reflog(): move verbose to flags argument
164 - expire_reflog(): pass flags through to expire_reflog_ent()
165 - struct expire_reflog_cb: a new callback data type
166 - Rename expire_reflog_cb to expire_reflog_policy_cb
167 - expire_reflog(): move updateref to flags argument
168 - expire_reflog(): move dry_run to flags argument
169 - expire_reflog(): add a "flags" argument
170 - expire_reflog(): extract two policy-related functions
171 - Extract function should_expire_reflog_ent()
172 - expire_reflog(): use a lock_file for rewriting the reflog file
173 - expire_reflog(): return early if the reference has no reflog
174 - expire_reflog(): rename "ref" parameter to "refname"
175 - expire_reflog(): it's not an each_ref_fn anymore
176 - refs.c: add a function to append a reflog entry to a fd
177 - refs.c: make ref_transaction_delete a wrapper for ref_transaction_update
178 - refs.c: make ref_transaction_create a wrapper for ref_transaction_update
180 Restructure "reflog expire" to fit the reflogs better with the
181 recently updated ref API.
183 Looked reasonable (except that ome shortlog entries stood out like
187 * po/doc-core-ignorestat (2014-12-12) 1 commit
188 - doc: core.ignoreStat clarify the --assume-unchanged effect
193 * rs/use-strbuf-complete-line (2014-12-12) 1 commit
194 (merged to 'next' on 2014-12-15 at d6426a0)
195 + use strbuf_complete_line() for adding a newline if needed
197 Will merge to 'master'.
200 * jk/add-i-read-error (2014-12-15) 1 commit
201 - add--interactive: leave main loop on read error
203 "git add -i" did not notice when the interactive command input
204 stream went away and kept asking.
206 Will merge to 'next'.
209 * pd/completion-filenames-fix (2014-12-15) 1 commit
210 - Update documentation occurrences of filename .sh
212 The top-of-the-file instruction for completion scripts (in contrib/)
213 did not name the files correctly.
215 Will merge to 'next'.
218 * rd/send-email-2047-fix (2014-12-15) 2 commits
219 - send-email: handle adjacent RFC 2047-encoded words properly
220 - send-email: align RFC 2047 decoding more closely with the spec
222 "git send-email" did not handle RFC 2047 encoded headers quite
225 Will merge to 'next'.
227 --------------------------------------------------
230 * pw/remote-set-url-fetch (2014-11-26) 1 commit
231 - remote: add --fetch and --both options to set-url
236 * ye/http-accept-language (2014-12-03) 2 commits
238 . http: send Accept-Language header if possible
240 Breaks various people ($gmane/260903).
243 * ms/submodule-update-config-doc (2014-11-03) 1 commit
244 - submodule: clarify documentation for update subcommand
246 Needs a reroll ($gmane/259037).
249 * je/quiltimport-no-fuzz (2014-10-21) 2 commits
250 - git-quiltimport: flip the default not to allow fuzz
251 - git-quiltimport.sh: allow declining fuzz with --exact option
253 "quiltimport" drove "git apply" always with -C1 option to reduce
254 context of the patch in order to give more chance to somewhat stale
255 patches to apply. Add an "--exact" option to disable, and also
256 "-C$n" option to customize this behaviour. The top patch
257 optionally flips the default to "--exact".
259 Tired of waiting for an Ack; will discard.
262 * jc/push-cert-hmac-optim (2014-09-25) 2 commits
263 - receive-pack: truncate hmac early and convert only necessary bytes
264 - sha1_to_hex: split out "hex-format n bytes" helper and use it
266 This is "we could do this if we wanted to", not "we measured and it
267 improves performance critical codepath".
272 * mt/patch-id-stable (2014-06-10) 1 commit
273 - patch-id: change default to stable
275 Teaches "git patch-id" to compute the patch ID that does not change
276 when the files in a single patch is reordered. As this new algorithm
277 is backward incompatible, the last bit to flip it to be the default
278 is left out of 'master' for now.
280 Nobody seems to be jumping up & down requesting this last step,
281 which makes the result somewhat backward incompatible.
285 * tr/remerge-diff (2014-11-10) 9 commits
286 - t4213: avoid "|" in sed regexp
287 - log --remerge-diff: show what the conflict resolution changed
288 - name-hash: allow dir hashing even when !ignore_case
289 - merge-recursive: allow storing conflict hunks in index
290 - merge_diff_mode: fold all merge diff variants into an enum
291 - combine-diff: do not pass revs->dense_combined_merges redundantly
292 - merge-recursive: -Xindex-only to leave worktree unchanged
293 - merge-recursive: internal flag to avoid touching the worktree
294 - merge-recursive: remove dead conditional in update_stages()
296 "log -p" output learns a new way to let users inspect a merge
297 commit by showing the differences between the automerged result
298 with conflicts the person who recorded the merge would have seen
299 and the final conflict resolution that was recorded in the merge.
301 Waiting for a reroll ($gmane/256591).
304 * hv/submodule-config (2014-11-11) 4 commits
305 - do not die on error of parsing fetchrecursesubmodules option
306 - use new config API for worktree configurations of submodules
307 - extract functions for submodule config set and lookup
308 - implement submodule config cache for lookup of submodule names
310 Kicked back to 'pu' per request ($gmane/255610).
313 * ab/add-interactive-show-diff-func-name (2014-05-12) 2 commits
314 - SQUASH??? git-add--interactive: Preserve diff heading when splitting hunks
315 - git-add--interactive: Preserve diff heading when splitting hunks
317 Waiting for a reroll.
320 * jn/gitweb-utf8-in-links (2014-05-27) 1 commit
321 - gitweb: Harden UTF-8 handling in generated links
326 * ss/userdiff-update-csharp-java (2014-06-02) 2 commits
327 - userdiff: support Java try keyword
328 - userdiff: support C# async methods and correct C# keywords
330 Reviews sent; waiting for a response.
333 * bg/rebase-off-of-previous-branch (2014-04-16) 1 commit
334 - git-rebase: print name of rev when using shorthand
336 Teach "git rebase -" to report the concrete name of the branch
337 (i.e. the previous one).
339 But it stops short and does not do the same for "git rebase @{-1}".
343 * rb/merge-prepare-commit-msg-hook (2014-01-10) 4 commits
344 - merge: drop unused arg from abort_commit method signature
345 - merge: make prepare_to_commit responsible for write_merge_state
346 - t7505: ensure cleanup after hook blocks merge
347 - t7505: add missing &&
349 Expose more merge states (e.g. $GIT_DIR/MERGE_MODE) to hooks that
350 run during "git merge". The log message stresses too much on one
351 hook, prepare-commit-msg, but it would equally apply to other hooks
352 like post-merge, I think.
354 Waiting for a reroll.
357 * jc/graph-post-root-gap (2013-12-30) 3 commits
358 - WIP: document what we want at the end
359 - graph: remove unused code a bit
360 - graph: stuff the current commit into graph->columns[]
362 This was primarily a RFH ($gmane/239580).
365 * tg/perf-lib-test-perf-cleanup (2013-09-19) 2 commits
366 - perf-lib: add test_perf_cleanup target
367 - perf-lib: split starting the test from the execution
369 Add test_perf_cleanup shell function to the perf suite, that allows
370 the script writers to define a test with a clean-up action.
375 * jc/show-branch (2014-03-24) 5 commits
376 - show-branch: use commit slab to represent bitflags of arbitrary width
377 - show-branch.c: remove "all_mask"
378 - show-branch.c: abstract out "flags" operation
379 - show-branch.c: lift all_mask/all_revs to a global static
380 - show-branch.c: update comment style
382 Waiting for the final step to lift the hard-limit before sending it out.
384 --------------------------------------------------
387 * dm/compat-s-ifmt-for-zos (2014-12-04) 1 commit
388 (merged to 'next' on 2014-12-15 at 0eb2fe6)
389 + compat: convert modes to use portable file type values
391 Long overdue departure from the assumption that S_IFMT is shared by
392 everybody made in 2005.
394 Will merge to 'master'.
397 * jk/credential-quit (2014-12-04) 2 commits
398 (merged to 'next' on 2014-12-15 at 4cfd999)
399 + prompt: respect GIT_TERMINAL_PROMPT to disable terminal prompts
400 + credential: let helpers tell us to quit
402 Credential helpers are asked in turn until one of them give
403 positive response, which is cumbersome to turn off when you need to
404 run Git in an automated setting. The credential helper interface
405 learned to allow a helper to say "stop, don't ask other helpers."
406 Also GIT_TERMINAL_PROMPT environment can be set to false to disable
407 our built-in prompt mechanism for passwords.
409 Will merge to 'master'.
412 * mg/branch-d-m-f (2014-12-09) 2 commits
413 (merged to 'next' on 2014-12-15 at 8366f2c)
414 + branch: allow -f with -m and -d
415 + t3200-branch: test -M
417 "git branch -d" (delete) and "git branch -m" (move) learned to
418 honor "-f" (force) flag; unlike many other subcommands, the way to
419 force these have been with separate "-D/-M" options, which was
422 Will merge to 'master'.
425 * mg/doc-check-ignore-tracked-are-not-ignored (2014-12-04) 1 commit
426 (merged to 'next' on 2014-12-15 at c50f748)
427 + check-ignore: clarify treatment of tracked files
429 Will merge to 'master'.
432 * rt/completion-tag (2014-12-04) 1 commit
433 (merged to 'next' on 2014-12-15 at b03ee39)
434 + completion: add git-tag options
436 Will merge to 'master'.
439 * jk/for-each-reflog-ent-reverse (2014-12-05) 2 commits
440 (merged to 'next' on 2014-12-15 at de71f08)
441 + for_each_reflog_ent_reverse: turn leftover check into assertion
442 + for_each_reflog_ent_reverse: fix newlines on block boundaries
444 The code that reads the reflog from the newer to the older entries
445 did not handle an entry that crosses a boundary of block it uses to
448 Will merge to 'master'.
451 * po/doc-assume-unchanged (2014-12-09) 2 commits
452 (merged to 'next' on 2014-12-15 at 646e77e)
453 + gitignore.txt: do not suggest assume-unchanged
454 + doc: make clear --assume-unchanged's user contract
456 Fixes long-standing misunderstanding of what assume-unchanged is
457 about. Some text near what is removed by the bottom patch may also
460 Will merge to 'master'.
463 * tb/t0027-eol-conversion (2014-12-05) 1 commit
464 (merged to 'next' on 2014-12-15 at ba24e75)
465 + t0027: check the eol conversion warnings
467 Will merge to 'master'.
470 * jk/always-allow-large-packets (2014-12-10) 1 commit
471 (merged to 'next' on 2014-12-15 at c3fb2c8)
472 + pkt-line: allow writing of LARGE_PACKET_MAX buffers
474 "git push" and "git fetch" did not communicate an overlong refname
477 Will merge to 'master'.
480 * jk/commit-date-approxidate (2014-12-11) 2 commits
481 (merged to 'next' on 2014-12-15 at 047530e)
482 + commit: always populate GIT_AUTHOR_* variables
483 + commit: loosen ident checks when generating template
485 Recent update to "git commit" broke amending an existing commit
486 with bogus author/committer lines without a valid e-mail address.
488 Will merge to 'master'.
491 * jk/read-packed-refs-without-path-max (2014-12-10) 3 commits
492 (merged to 'next' on 2014-12-15 at c6d6f56)
493 + read_packed_refs: use skip_prefix instead of static array
494 + read_packed_refs: pass strbuf to parse_ref_line
495 + read_packed_refs: use a strbuf for reading lines
497 Git did not correctly read an overlong refname from a packed refs
500 Will merge to 'master'.
503 * jn/doc-api-errors (2014-12-04) 1 commit
504 - doc: document error handling functions and conventions
509 * js/fsck-tag-validation (2014-12-09) 2 commits
510 (merged to 'next' on 2014-12-15 at 455f26c)
511 + index-pack: terminate object buffers with NUL
512 + fsck: properly bound "invalid tag name" error message
514 New tag object format validation added in 2.2 showed garbage
515 after a tagname it reported in its error message.
517 Will merge to 'master'.
520 * js/test-hashmap-squelch-gcc (2014-12-09) 1 commit
521 (merged to 'next' on 2014-12-15 at a8da691)
522 + test-hashmap: squelch gcc compiler warning
524 Will merge to 'master'.
527 * ok/rebase-i-count-todo (2014-12-10) 1 commit
528 (merged to 'next' on 2014-12-15 at 4a1f7ed)
529 + Show number of TODO items for interactive rebase
531 Will merge to 'master'.
534 * rw/apply-does-not-take-ignore-date (2014-12-09) 1 commit
535 (merged to 'next' on 2014-12-15 at ded2f99)
536 + git-am.txt: --ignore-date flag is not passed to git-apply
538 Will merge to 'master'.
541 * jc/exec-cmd-system-path-leak-fix (2014-11-30) 1 commit
542 (merged to 'next' on 2014-12-15 at f926ee5)
543 + system_path(): always return free'able memory to the caller
545 The function sometimes returned a non-freeable memory and some
546 other times returned a piece of memory that must be freed.
548 Will merge to 'master'.
551 * jc/hook-cleanup (2014-12-01) 1 commit
552 (merged to 'next' on 2014-12-15 at f5759d0)
553 + run-command.c: retire unused run_hook_with_custom_index()
557 Will merge to 'master'.
560 * jn/rerere-fail-on-auto-update-failure (2014-12-03) 2 commits
562 - rerere: error out on autoupdate failure
564 Will be rerolled as a part of a larger series.
567 * js/push-to-deploy (2014-11-30) 2 commits
568 (merged to 'next' on 2014-12-15 at ef8c99f)
569 + t5516: more tests for receive.denyCurrentBranch=updateInstead
570 + receive-pack: add another option for receive.denyCurrentBranch
571 (this branch is used by jc/push-to-checkout.)
573 "git push" into a repository with a working tree normally refuses
574 to modify the branch that is checked out. The command learned to
575 optionally do an equivalent of "git reset --hard" only when there
576 is no change to the working tree and the index instead, which would
577 be useful to "deploy" by pushing into a repository.
579 Will merge to 'master'.
582 * jc/push-to-checkout (2014-12-01) 2 commits
583 - receive-pack: support push-to-checkout hook
584 - receive-pack: refactor updateInstead codepath
585 (this branch uses js/push-to-deploy.)
587 Extending the js/push-to-deploy topic, the behaviour of "git push"
588 when updating the working tree and the index with an update to the
589 branch that is checked out can be tweaked by push-to-checkout hook.
594 * lh/send-email-hide-x-mailer (2014-12-11) 4 commits
596 - test/send-email: --[no-]xmailer tests
598 - send-email: add --[no-]xmailer option
600 "git send-email" normally identifies itself via X-Mailer: header
601 in the message it sends out. A new command line flag allows the
602 header to be squelched.
604 Will merge to 'next' after squashing the fixups.
607 * nd/list-files (2014-12-01) 19 commits
608 - list-files: -M aka diff-cached
609 - list-files -F: show submodules with the new indicator '&'
610 - list-files: add -F/--classify
611 - list-files: show directories as well as files
612 - list-files: do not show duplicate cached entries
613 - list-files: sort output and remove duplicates
614 - list-files: add -t back
615 - list-files: add -1 short for --no-column
616 - list-files: add -R/--recursive short for --max-depth=-1
617 - list-files: -u does not imply showing stages
618 - list-files: a user friendly version of ls-files and more
619 - ls-files: support --max-depth
620 - ls-files: add --column
621 - ls-files: add --color to highlight file names
622 - ls-files: buffer full item in strbuf before printing
623 - ls_colors.c: highlight submodules like directories
624 - ls_colors.c: add a function to color a file name
625 - ls_colors.c: parse color.ls.* from config file
626 - ls_colors.c: add $LS_COLORS parsing code
628 A new "git list-files" Porcelain command, "ls-files" with bells and
632 * nd/ls-tree-pathspec (2014-12-01) 5 commits
633 (merged to 'next' on 2014-12-15 at 8da6e09)
634 + t3102: style modernization
635 + t3102: document that ls-tree does not yet support negated pathspec
636 + ls-tree: disable negative pathspec because it's not supported
637 + ls-tree: remove path filtering logic in show_tree
638 + tree.c: update read_tree_recursive callback to pass strbuf as base
640 "git ls-tree" does not support path selection based on negative
641 pathspecs, but did not error out when negative pathspecs are given.
643 Will merge to 'master'.
646 * rj/t0050-passes (2014-11-30) 1 commit
647 (merged to 'next' on 2014-12-15 at f56c339)
648 + t0050-*.sh: mark the rename (case change) test as passing
650 Will merge to 'master'.
653 * rt/for-each-ref-spell-tcl-as-Tcl (2014-11-30) 1 commit
654 (merged to 'next' on 2014-12-15 at c0fcefb)
655 + for-each-ref: correct spelling of Tcl in option description
657 Will merge to 'master'.
660 * sb/ref-transaction-reflog (2014-12-03) 2 commits
661 . refs.c: rename transaction.updates to transaction.ref_updates
662 . refs.c: rename the transaction functions
663 (this branch uses sb/ref-transaction-unify-to-update.)
665 Will be rerolled as a part of a larger series.
668 * nd/multiple-work-trees (2014-12-01) 34 commits
669 - git-common-dir: make "modules/" per-working-directory directory
670 - checkout: do not fail if target is an empty directory
671 - t2025: add a test to make sure grafts is working from a linked checkout
672 - checkout: don't require a work tree when checking out into a new one
673 - git_path(): keep "info/sparse-checkout" per work-tree
674 - count-objects: report unused files in $GIT_DIR/worktrees/...
675 - gc: support prune --worktrees
676 - gc: factor out gc.pruneexpire parsing code
677 - gc: style change -- no SP before closing parenthesis
678 - checkout: clean up half-prepared directories in --to mode
679 - checkout: reject if the branch is already checked out elsewhere
680 - prune: strategies for linked checkouts
681 - checkout: support checking out into a new working directory
682 - use new wrapper write_file() for simple file writing
683 - wrapper.c: wrapper to open a file, fprintf then close
684 - setup.c: support multi-checkout repo setup
685 - setup.c: detect $GIT_COMMON_DIR check_repository_format_gently()
686 - setup.c: convert check_repository_format_gently to use strbuf
687 - setup.c: detect $GIT_COMMON_DIR in is_git_directory()
688 - setup.c: convert is_git_directory() to use strbuf
689 - git-stash: avoid hardcoding $GIT_DIR/logs/....
690 - *.sh: avoid hardcoding $GIT_DIR/hooks/...
691 - git-sh-setup.sh: use rev-parse --git-path to get $GIT_DIR/objects
692 - $GIT_COMMON_DIR: a new environment variable
693 - commit: use SEQ_DIR instead of hardcoding "sequencer"
694 - fast-import: use git_path() for accessing .git dir instead of get_git_dir()
695 - reflog: avoid constructing .lock path with git_path
696 - *.sh: respect $GIT_INDEX_FILE
697 - git_path(): be aware of file relocation in $GIT_DIR
698 - path.c: group git_path(), git_pathdup() and strbuf_git_path() together
699 - path.c: rename vsnpath() to do_git_path()
700 - git_snpath(): retire and replace with strbuf_git_path()
701 - path.c: make get_pathname() call sites return const char *
702 - path.c: make get_pathname() return strbuf instead of static buffer
704 A replacement for contrib/workdir/git-new-workdir that does not
705 rely on symbolic links and make sharing of objects and refs safer
706 by making the borrowee and borrowers aware of each other.
709 * jk/colors (2014-12-09) 6 commits
710 (merged to 'next' on 2014-12-15 at 20b045f)
711 + parse_color: drop COLOR_BACKGROUND macro
712 + diff-highlight: allow configurable colors
713 + parse_color: recognize "no$foo" to clear the $foo attribute
714 + parse_color: support 24-bit RGB values
715 + parse_color: refactor color storage
716 + Merge branch 'jn/parse-config-slot' into jk/colors
718 "diff-highlight" filter (in contrib/) allows its color output
719 to be customized via configuration variables.
721 Will merge to 'master'.
724 * jk/lock-ref-sha1-basic-return-errors (2014-11-20) 1 commit
725 (merged to 'next' on 2014-12-15 at c48b110)
726 + lock_ref_sha1_basic: do not die on locking errors
728 Correct an API anomaly.
730 Will merge to 'master'.
733 * ps/new-workdir-into-empty-directory (2014-12-03) 1 commit
734 (merged to 'next' on 2014-12-15 at 0787b56)
735 + git-new-workdir: don't fail if the target directory is empty
737 "git new-workdir" (in contrib/) can be used to populate an empty
738 and existing directory now.
740 Will merge to 'master'.
743 * sb/copy-fd-errno (2014-11-17) 1 commit
744 - copy.c: make copy_fd preserve meaningful errno
746 Will be rerolled as a part of a larger series.
749 * sv/doc-stripspace (2014-12-04) 1 commit
750 (merged to 'next' on 2014-12-15 at e86f8ba)
751 + Documentation/git-stripspace: add synopsis for --comment-lines
753 Will merge to 'master'.
756 * dw/shell-basename-dashdash-before-stripping-leading-dash-from-login (2014-11-25) 1 commit
757 (merged to 'next' on 2014-12-15 at 42937b7)
758 + git-sh-setup.sh: use dashdash with basename call
760 Will merge to 'master'.
763 * jc/refer-to-t-readme-from-submitting-patches (2014-11-24) 2 commits
764 (merged to 'next' on 2014-12-15 at 0e88699)
765 + t/README: justify why "! grep foo" is sufficient
766 + SubmittingPatches: refer to t/README for tests
768 Will merge to 'master'.
771 * jc/t9001-modernise (2014-11-25) 5 commits
772 - t9001: style modernisation phase #5
773 - t9001: style modernisation phase #4
774 - t9001: style modernisation phase #3
775 - t9001: style modernisation phase #2
776 - t9001: style modernisation phase #1
777 (this branch uses pb/send-email-te.)
780 * js/t5000-dont-copy-bin-sh (2014-11-24) 1 commit
781 (merged to 'next' on 2014-12-15 at 65ffd05)
782 + t5000 on Windows: do not mistake "sh.exe" as "sh"
784 Will merge to 'master'.
787 * mg/add-ignore-errors (2014-11-21) 1 commit
788 (merged to 'next' on 2014-12-15 at 3834789)
789 + add: ignore only ignored files
791 "git add --ignore-errors ..." did not ignore an error to
792 give a file that did not exist.
794 Will merge to 'master'.
797 * mh/find-uniq-abbrev (2014-11-26) 1 commit
798 (merged to 'next' on 2014-12-15 at e3b2b62)
799 + sha1_name: avoid unnecessary sha1 lookup in find_unique_abbrev
801 The code to abbreviate an object name to its short unique prefix
802 has been optimized when no abbreviation was requested.
804 Will merge to 'master'.
807 * mh/simplify-repack-without-refs (2014-11-25) 7 commits
808 (merged to 'next' on 2014-12-15 at 351e03e)
809 + sort_string_list(): rename to string_list_sort()
810 + prune_remote(): iterate using for_each_string_list_item()
811 + prune_remote(): rename local variable
812 + repack_without_refs(): make the refnames argument a string_list
813 + prune_remote(): sort delete_refs_list references en masse
814 + prune_remote(): initialize both delete_refs lists in a single loop
815 + prune_remote(): exit early if there are no stale references
817 "git remote update --prune" to drop many refs has been optimized.
819 Will merge to 'master'.
822 * pb/am-message-id-footer (2014-11-25) 2 commits
823 (merged to 'next' on 2014-12-15 at b44b6bd)
824 + git-am: add --message-id/--no-message-id
825 + git-mailinfo: add --message-id
827 "git am" learned "--message-id" option to copy the message ID of
828 the incoming e-mail to the log message of resulting commit.
830 Will merge to 'master'.
833 * pb/send-email-te (2014-11-25) 2 commits
834 (merged to 'next' on 2014-12-15 at 38c2810)
835 + git-send-email: add --transfer-encoding option
836 + git-send-email: delay creation of MIME headers
837 (this branch is used by jc/t9001-modernise.)
839 "git send-email" learned "--transfer-encoding" option to force
840 a non-fault Content-Transfer-Encoding header (e.g. base64).
842 Will merge to 'master'.
845 * rj/no-xopen-source-for-cygwin (2014-11-24) 1 commit
846 (merged to 'next' on 2014-12-15 at 6e8e9ff)
847 + git-compat-util.h: don't define _XOPEN_SOURCE on cygwin
849 Avoid compilation warnings on recent gcc toolchain on Cygwin.
851 Will merge to 'master'.
854 * sb/string-list (2014-12-04) 3 commits
855 (merged to 'next' on 2014-12-15 at 8bb8ddd)
856 + string_list: remove string_list_insert_at_index() from its API
857 + mailmap: use higher level string list functions
858 + string_list: document string_list_(insert,lookup)
862 Will merge to 'master'.
865 * sb/write-sha1-update-reflog (2014-11-24) 1 commit
866 . refs.c: move reflog updates into its own function
868 Moves a part of function around to add a helper that still only has
869 one caller. Need to see how this helps in a bigger picture.
872 * tb/config-core-filemode-check-on-broken-fs (2014-11-21) 1 commit
873 (merged to 'next' on 2014-12-15 at 3e5490b)
874 + init-db: improve the filemode trustability check
876 Some filesystems assign filemodes in a strange way, fooling then
877 automatic "filemode trustability" check done during a new
880 Will merge to 'master'.
883 * jk/approxidate-avoid-y-d-m-over-future-dates (2014-11-13) 2 commits
884 (merged to 'next' on 2014-12-15 at 397e986)
885 + approxidate: allow ISO-like dates far in the future
886 + pass TIME_DATE_NOW to approxidate future-check
888 Traditionally we tried to avoid interpreting date strings given by
889 the user as future dates, e.g. GIT_COMMITTER_DATE=2014-12-10 when
890 used early November 2014 was taken as "October 12, 2014" because it
891 is likely that a date in the future, December 10, is a mistake.
893 Loosen this and do not tiebreak by future-ness of the date when
895 (1) ISO-like format is used, and
896 (2) the string can make sense interpreted as both y-m-d and y-d-m.
901 * br/imap-send-verbosity (2014-11-05) 1 commit
902 (merged to 'next' on 2014-12-15 at 504af0b)
903 + imap-send: use parse options API to determine verbosity
904 (this branch is used by br/imap-send-via-libcurl.)
909 * br/imap-send-via-libcurl (2014-11-10) 1 commit
910 (merged to 'next' on 2014-12-15 at 90db637)
911 + git-imap-send: use libcurl for implementation
912 (this branch uses br/imap-send-verbosity.)
914 Newer libCurl knows how to talk IMAP; "git imap-send" has been
915 updated to use this instead of a hand-rolled OpenSSL calls.
920 * cc/interpret-trailers-more (2014-11-10) 4 commits
921 (merged to 'next' on 2014-12-15 at 77f6c6a)
922 + trailer: add test with an old style conflict block
923 + trailer: reuse ignore_non_trailer() to ignore conflict lines
924 + commit: make ignore_non_trailer() non static
925 + Merge branch 'jc/conflict-hint' into cc/interpret-trailers-more
926 (this branch uses jc/conflict-hint.)
928 "git interpret-trailers" learned to properly handle the
929 "Conflicts:" block at the end.
931 Will merge to 'master'.
934 * nd/lockfile-absolute (2014-11-03) 1 commit
935 (merged to 'next' on 2014-12-15 at 34db9af)
936 + lockfile.c: store absolute path
938 The lockfile API can get confused which file to clean up when the
939 process moved the $cwd after creating a lockfile.
944 * jc/merge-bases (2014-10-30) 2 commits
945 (merged to 'next' on 2014-12-15 at cac279e)
946 + get_merge_bases(): always clean-up object flags
947 + bisect: clean flags after checking merge bases
949 The get_merge_bases*() API was easy to misuse by careless
950 copy&paste coders, leaving object flags tainted in the commits that
951 needed to be traversed.
956 * jc/strbuf-add-lines-avoid-sp-ht-sequence (2014-10-27) 1 commit
957 (merged to 'next' on 2014-12-15 at b499889)
958 + strbuf_add_commented_lines(): avoid SP-HT sequence in commented lines
960 The commented output used to blindly add a SP before the payload
961 line, resulting in "# \t<indented text>\n" when the payload began
962 with a HT. Instead, produce "#\t<indented text>\n".
967 * nd/untracked-cache (2014-12-15) 24 commits
969 - untracked cache: guard and disable on system changes
970 - mingw32: add uname()
971 - t7063: tests for untracked cache
972 - update-index: test the system before enabling untracked cache
973 - update-index: manually enable or disable untracked cache
974 - status: enable untracked cache
975 - untracked-cache: temporarily disable with $GIT_DISABLE_UNTRACKED_CACHE
976 - untracked cache: mark index dirty if untracked cache is updated
977 - untracked cache: print stats with $GIT_TRACE_UNTRACKED_STATS
978 - untracked cache: avoid racy timestamps
979 - read-cache.c: split racy stat test to a separate function
980 - untracked cache: invalidate at index addition or removal
981 - untracked cache: load from UNTR index extension
982 - untracked cache: save to an index extension
983 - ewah: add convenient wrapper ewah_serialize_strbuf()
984 - untracked cache: don't open non-existent .gitignore
985 - untracked cache: mark what dirs should be recursed/saved
986 - untracked cache: record/validate dir mtime and reuse cached output
987 - untracked cache: make a wrapper around {open,read,close}dir()
988 - untracked cache: invalidate dirs recursively if .gitignore changes
989 - untracked cache: initial untracked cache validation
990 - untracked cache: record .gitignore information and dir hierarchy
991 - dir.c: optionally compute sha-1 of a .gitignore file
996 * jc/conflict-hint (2014-10-28) 4 commits
997 (merged to 'next' on 2014-12-15 at b72475f)
998 + merge & sequencer: turn "Conflicts:" hint into a comment
999 + builtin/commit.c: extract ignore_non_trailer() helper function
1000 + merge & sequencer: unify codepaths that write "Conflicts:" hint
1001 + builtin/merge.c: drop a parameter that is never used
1002 (this branch is used by cc/interpret-trailers-more.)
1004 Unlike all the other hints given in the commit log editor, the list
1005 of conflicted paths were appended at the end without commented out.
1007 Will cook in 'next'.
1010 * jc/diff-b-m (2014-10-23) 1 commit
1011 (merged to 'next' on 2014-12-15 at 59c6636)
1012 + diff -B -M: fix output for "copy and then rewrite" case
1014 Fix long-standing bug in "diff -B -M" output.
1016 Will cook in 'next'.
1019 * jc/checkout-local-track-report (2014-10-14) 1 commit
1020 (merged to 'next' on 2014-12-15 at e91a7df)
1021 + checkout: report upstream correctly even with loosely defined branch.*.merge
1023 The report from "git checkout" on a branch that builds on another
1024 local branch by setting its branch.*.merge to branch name (not a
1025 full refname) incorrectly said that the upstream is gone.
1027 Will cook in 'next'.
1030 * jc/clone-borrow (2014-10-15) 1 commit
1031 (merged to 'next' on 2014-12-15 at 08fdf77)
1032 + clone: --dissociate option to mark that reference is only temporary
1034 Allow "git clone --reference" to be used more safely.
1036 Will cook in 'next'.
1038 --------------------------------------------------
1041 * mb/enable-lib-terminal-test-on-newer-darwin (2014-11-14) 1 commit
1042 . t/lib-terminal: allow TTY tests to run under recent Mac OS
1044 We probably should drop this ($gmane/259609).
1047 * zk/grep-color-words (2014-10-27) 2 commits
1048 . Revert "grep: fix match highlighting for combined patterns with context lines"
1049 . grep: fix match highlighting for combined patterns with context lines
1051 rs/grep-color-words topic solves it in a different way.
1056 * jn/dedup-doc-header (2014-12-10) 2 commits
1057 . put string-list API documentation in one place
1058 . put strbuf API documentation in one place
1060 We would want to have an easy way for developers to learn about
1061 APIs, and also a way to encourage them to keep the API
1062 documentation up to date when they make changes. Having header
1063 comments and API documentation duplicated in two different places
1064 risked them going out of sync.
1066 The approach taken by jk/strbuf-doc-to-header is the other way
1067 around, which people seem to prefer, so this is discarded.
1070 * jt/timer-settime (2014-08-29) 6 commits
1071 . use timer_settime() for new platforms
1072 . autoconf: check for timer_settime()
1073 . autoconf: check for struct itimerspec
1074 . autoconf: check for struct sigevent
1075 . autoconf: check for struct timespec
1076 . autoconf: check for timer_t
1078 Was wanting for a reroll.
1081 * rs/ref-transaction-reflog (2014-11-03) 15 commits
1082 . refs.c: allow deleting refs with a broken sha1
1083 . refs.c: remove lock_any_ref_for_update
1084 . refs.c: make unlock_ref/close_ref/commit_ref static
1085 . refs.c: rename log_ref_setup to create_reflog
1086 . reflog.c: use a reflog transaction when writing during expire
1087 . refs.c: allow multiple reflog updates during a single transaction
1088 . refs.c: only write reflog update if msg is non-NULL
1089 . refs.c: add a flag to allow reflog updates to truncate the log
1090 . refs.c: add a transaction function to append a reflog entry
1091 . copy.c: make copy_fd preserve meaningful errno
1092 . refs.c: add a function to append a reflog entry to a fd
1093 . refs.c: add a new update_type field to ref_update
1094 . refs.c: rename the transaction functions
1095 . refs.c: make ref_transaction_delete a wrapper for ref_transaction_update
1096 . refs.c make ref_transaction_create a wrapper to ref_transaction_update
1097 (this branch is used by rs/ref-transaction-rename and rs/ref-transaction-send-pack.)
1099 Stefan Beller started working on reorganizing these three series,
1100 which unfortunately did not see much reviews.
1103 * rs/ref-transaction-rename (2014-11-07) 16 commits
1104 . refs.c: add an err argument to pack_refs
1105 . refs.c: make lock_packed_refs take an err argument
1106 . refs.c: make add_packed_ref return an error instead of calling die
1107 . refs.c: replace the onerr argument in update_ref with a strbuf err
1108 . refs.c: make the *_packed_refs functions static
1109 . refs.c: make repack_without_refs static
1110 . remote.c: use a transaction for deleting refs
1111 . refs.c: write updates to packed refs when a transaction has more than one ref
1112 . refs.c: move reflog updates into its own function
1113 . refs.c: rollback the lockfile before we die() in repack_without_refs
1114 . refs.c: update rename_ref to use a transaction
1115 . refs.c: add transaction support for renaming a reflog
1116 . refs.c: use a stringlist for repack_without_refs
1117 . refs.c: use packed refs when deleting refs during a transaction
1118 . refs.c: return error instead of dying when locking fails during transaction
1119 . refs.c: allow passing raw git_committer_info as email to _update_reflog
1120 (this branch is used by rs/ref-transaction-send-pack; uses rs/ref-transaction-reflog.)
1122 Stefan Beller started working on reorganizing these three series,
1123 which unfortunately did not see much reviews.
1126 * rs/ref-transaction-send-pack (2014-11-07) 7 commits
1127 . refs.c: add an err argument to create_symref
1128 . refs.c: add an err argument to create_reflog
1129 . t5543-atomic-push.sh: add basic tests for atomic pushes
1130 . push.c: add an --atomic-push argument
1131 . receive-pack.c: use a single transaction when atomic-push is negotiated
1132 . send-pack.c: add an --atomic-push command line argument
1133 . receive-pack.c: add protocol support to negotiate atomic-push
1134 (this branch uses rs/ref-transaction-reflog and rs/ref-transaction-rename.)
1136 Stefan Beller started working on reorganizing these three series,
1137 which unfortunately did not see much reviews.
1140 * sb/simplify-repack-without-refs (2014-11-20) 1 commit
1141 . refs.c: use a string_list for repack_without_refs
1144 * sb/log-ref-write-fd (2014-11-20) 1 commit
1145 . refs.c: add a function to append a reflog entry to a fd
1147 Will be rerolled as a part of a larger series.
1150 * sb/ref-transaction-unify-to-update (2014-11-20) 2 commits
1151 . refs.c: make ref_transaction_delete a wrapper for ref_transaction_update
1152 . refs.c: make ref_transaction_create a wrapper for ref_transaction_update
1153 (this branch is used by sb/ref-transaction-reflog.)
1155 Code simplification.
1157 Will be rerolled as a part of a larger series.