To: git@vger.kernel.org
Bcc: lwn@lwn.net
-Subject: What's cooking in git.git (Oct 2015, #02; Wed, 7)
-X-master-at: f5b6079871904ba5b0a8548f91545f126caf898b
-X-next-at: 19af20e0b28da5dcbe194ac407afe5175cc4fb85
+Subject: What's cooking in git.git (Oct 2015, #03; Wed, 14)
+X-master-at: b27dacc1a80d1eca1994e6552d913e42d517f998
+X-next-at: 4b8c365398e63642c531f6a096df9da66a27f9fe
-What's cooking in git.git (Oct 2015, #02; Wed, 7)
+What's cooking in git.git (Oct 2015, #03; Wed, 14)
--------------------------------------------------
Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'.
-The tip of 'next' has been rewound and rebuilt. I plan to start
-merging the topics that have been cooking just above 'next' down in
-the coming days.
-
With somewhat reduced review bandwidth, I'd expect that the upcoming
cycle would be slower than usual. At tinyurl.com/gitCal, I
tentatively drew a 14-week schedule for this cycle (I plan to be
--------------------------------------------------
[Graduated to "master"]
-* gb/filter-branch-progress (2015-09-21) 2 commits
- (merged to 'next' on 2015-09-21 at 15e698d)
- + filter-branch: make report-progress more readable
- + filter-branch: add passed/remaining seconds on progress
-
- Give progress meter to "git filter-branch".
+* jk/asciidoctor-section-heading-markup-fix (2015-09-25) 1 commit
+ (merged to 'next' on 2015-10-07 at 8bbff49)
+ + Documentation: fix section header mark-up
-* ls/p4-path-encoding (2015-09-21) 3 commits
- (merged to 'next' on 2015-09-21 at 0772d82)
- + git-p4: use replacement character for non UTF-8 characters in paths
- (merged to 'next' on 2015-09-17 at 7f8b9e0)
- + git-p4: improve path encoding verbose output
- (merged to 'next' on 2015-09-08 at 56514f9)
- + git-p4: add config git-p4.pathEncoding
+* jk/notes-dwim-doc (2015-09-22) 1 commit
+ (merged to 'next' on 2015-10-07 at c4341d1)
+ + notes: correct documentation of DWIMery for notes references
+ (this branch is used by mh/notes-allow-reading-treeish.)
- "git p4" learned to reencode the pathname it uses to communicate
- with the p4 depot with a new option.
+ The way how --ref/--notes to specify the notes tree reference are
+ DWIMmed was not clearly documented.
-* nd/ignore-then-not-ignore (2015-09-21) 2 commits
- (merged to 'next' on 2015-09-21 at 2182591)
- + dir.c: don't exclude whole dir prematurely if neg pattern may match
- + dir.c: make last_exclude_matching_from_list() run til the end
+* nd/ls-remote-does-not-have-u-option (2015-09-28) 1 commit
+ (merged to 'next' on 2015-10-07 at 0790a76)
+ + ls-remote.txt: delete unsupported option
- Allow a later "!/abc/def" to override an earlier "/abc" that
- appears in the same .gitignore file to make it easier to express
- "everything in /abc directory is ignored, except for ...".
+* pt/pull-builtin (2015-10-02) 1 commit
+ (merged to 'next' on 2015-10-07 at 19af20e)
+ + merge: grammofix in please-commit-before-merge message
-* ti/glibc-stdio-mutex-from-signal-handler (2015-09-04) 1 commit
- (merged to 'next' on 2015-09-08 at c8047ba)
- + pager: don't use unsafe functions in signal handlers
- Allocation related functions and stdio are unsafe things to call
- inside a signal handler, and indeed killing the pager can cause
- glibc to deadlock waiting on allocation mutex as our signal handler
- tries to free() some data structures in wait_for_pager(). Reduce
- these unsafe calls.
+* tk/typofix-connect-unknown-proto-error (2015-09-25) 1 commit
+ (merged to 'next' on 2015-10-07 at cc3430e)
+ + connect: fix typo in result string of prot_name()
--------------------------------------------------
[New Topics]
-* cc/quote-comments (2015-10-07) 2 commits
- - quote: move comment before sq_quote_buf()
- - quote: fix broken sq_quote_buf() related comment
+* jc/mailinfo (2015-10-08) 1 commit
+ . mailinfo: ignore in-body header that we do not care about
+
+ Some people write arbitrary garbage at the beginning of a piece of
+ e-mail (or after -- >8 -- scissors -- >8 -- line) in the commit log
+ message and expect them to be discarded, even though "From:" and
+ "Subject:" are the only documented in-body headers that you are
+ supposed to have there. Allow some garbage (specifically, what may
+ look like RFC2822 headers like "MIME-Version: ...") to be there and
+ ignore them.
+
+ I have a feeling that that this is a step in a wrong direction.
+ Excluded from 'pu' for now.
- A no-op code-health maintenance.
+
+* jk/filter-branch-use-of-sed-on-incomplete-line (2015-10-12) 1 commit
+ - filter-branch: remove multi-line headers in msg filter
+
+ A recent "filter-branch --msg-filter" broke skipping of the commit
+ object header, which is fixed.
Will merge to 'next'.
-* dt/log-follow-config (2015-10-07) 1 commit
- - log: Update log.follow doc and add to config.txt
+* rd/test-path-utils (2015-10-08) 1 commit
+ - test-path-utils.c: remove incorrect assumption
- Description of the "log.follow" configuration variable in "git log"
- documentation is now also copied to "git config" documentation.
+ The normalize_ceiling_entry() function does not muck with the end
+ of the path it accepts, and the real world callers do rely on that,
+ but a test insisted that the function drops a trailing slash.
Will merge to 'next'.
-* es/worktree-add-cleanup (2015-10-07) 1 commit
- - t2026: rename worktree prune test
+* jc/doc-gc-prune-now (2015-10-14) 1 commit
+ - Documentation/gc: warn against --prune=<now>
- A no-op code-health maintenance.
+ "git gc" is safe to run anytime only because it has the built-in
+ grace period to protect young objects. In order to run with no
+ grace period, the user must make sure that the repository is
+ quiescent.
Will merge to 'next'.
-* sg/pretty-more-date-mode-format (2015-10-07) 1 commit
- - pretty: add format specifiers for short and raw date formats
+* jc/am-mailinfo-direct (2015-10-14) 1 commit
+ - am: make direct call to mailinfo
+ (this branch uses jc/mailinfo-lib.)
+
+ "git am" used to spawn "git mailinfo" via run_command() API once
+ per each patch, but learned to make a direct call to mailinfo()
+ instead.
+
+ Needs benchmark on platforms with slow run_command().
+
+
+* jc/mailinfo-lib (2015-10-14) 30 commits
+ - mailinfo: remove calls to exit() and die() deep in the callchain
+ - mailinfo: handle charset conversion errors in the caller
+ - mailinfo: libify
+ - mailinfo: move definition of MAX_HDR_PARSED to closer to its use
+ - mailinfo: move cleanup_space() before its users
+ - mailinfo: move check_header() after the helpers it uses
+ - mailinfo: move read_one_header_line() closer to its callers
+ - mailinfo: move content/content_top to struct mailinfo
+ - mailinfo: keep the parsed log message in a strbuf
+ - mailinfo: move [ps]_hdr_data to struct mailinfo
+ - mailinfo: move cmitmsg and patchfile to struct mailinfo
+ - mailinfo: handle_commit_msg() shouldn't be called after finding patchbreak
+ - mailinfo: move charset to struct mailinfo
+ - mailinfo: move transfer_encoding to struct mailinfo
+ - mailinfo: move metainfo_charset to struct mailinfo
+ - mailinfo: move use_scissors and use_inbody_headers to struct mailinfo
+ - mailinfo: move add_message_id and message_id to struct mailinfo
+ - mailinfo: move patch_lines to struct mailinfo
+ - mailinfo: move filter/header stage to struct mailinfo
+ - mailinfo: move global "FILE *fin, *fout" to struct mailinfo
+ - mailinfo: move keep_subject & keep_non_patch_bracket to struct mailinfo
+ - mailinfo: introduce "struct mailinfo" to hold globals
+ - mailinfo: move global "line" into mailinfo() function
+ - mailinfo: always pass "line" as an argument
+ - mailinfo: get rid of function-local static states
+ - mailinfo: move handle_boundary() lower
+ - mailinfo: fold decode_header_bq() into decode_header()
+ - mailinfo: explicitly close file handle to the patch output
+ - mailinfo: fix for off-by-one error in boundary stack
+ - mailinfo: remove a no-op call convert_to_utf8(it, "")
+ (this branch is used by jc/am-mailinfo-direct.)
+
+ The implementation of "git mailinfo" was refactored so that a
+ mailinfo() function can be directly called from inside a process.
+
+
+* jc/am-3-fallback-regression-fix (2015-10-09) 1 commit
+ - am -3: do not let failed merge from completing the error codepath
+ (this branch is used by js/am-3-merge-recursive-direct.)
+
+ "git am -3" had a small regression where it is aborted in its error
+ handling codepath when underlying merge-recursive failed in certain
+ ways, as it assumed that the internal call to merge-recursive will
+ never die, which is not the case (yet).
+
+
+* js/am-3-merge-recursive-direct (2015-10-12) 2 commits
+ - am: make a direct call to merge_recursive
+ - merge_recursive_options: introduce the "gently" flag
+ (this branch uses jc/am-3-fallback-regression-fix.)
+
+ The merge_recursive_generic() function has been made a bit safer to
+ call from inside a process. "git am -3" was taught to make a direct
+ call to the function when falling back to three-way merge.
+
+
+* km/cache-entry-refcnt (2015-10-12) 1 commit
+ - merge: fix cache_entry use-after-free
+
+ Sometimes we discarded a cache-entry that is still referenced from
+ name-hash (used only to hold the pathname there), leading to use
+ after free errors. Reference-count cache entries to work it
+ around.
+
+
+* ls/p4-test-updates (2015-10-12) 2 commits
+ - git-p4: skip t9819 test case on case insensitive file systems
+ - git-p4: avoid "stat" command in t9815 git-p4-submit-fail
+
+ A few test scripts around "git p4" have been improved for
+ portability.
- Introduce "%as" and "%aR" placeholders for "log --format" to show
- the author date in the short and raw formats.
+ Will merge to 'next'.
- I have a feeling that that this is a step in a wrong direction.
+* sb/submodule-config-parse (2015-10-12) 1 commit
+ - submodule-config: "goto" removal in parse_config()
-* tk/doc-interpret-trailers-grammo (2015-10-07) 1 commit
- - Documentation/interpret-trailers: Grammar fix
+ Will merge to 'next'.
+
+
+* tb/t0027-crlf (2015-10-12) 1 commit
+ - t0027: improve test for not-normalized files
+
+ The test for various line-ending conversions has been enhanced.
Will merge to 'next'.
($gmane/277574)
-* mr/worktree-list (2015-10-05) 8 commits
- - fixup! worktree: add a function to get worktree details
- - SQUASH???
+* mr/worktree-list (2015-10-08) 5 commits
- worktree: add 'list' command
- worktree: add details to the worktree struct
- worktree: add a function to get worktree details
- - SQUASH???
- worktree: refactor find_linked_symref function
- worktree: add top-level worktree.c
Add the "list" subcommand to "git worktree".
- Waiting for a reroll.
- ($gmane/278529, $gmane/279113).
-
* mg/httpd-tests-update-for-apache-2.4 (2015-04-08) 2 commits
- t/lib-git-svn: check same httpd module dirs as lib-httpd
($gmane/272180).
-* mh/notes-allow-reading-treeish (2015-07-13) 1 commit
+* mh/notes-allow-reading-treeish (2015-10-08) 3 commits
- notes: allow treeish expressions as notes ref
+ + Merge branch 'jk/notes-dwim-doc' into next
+ + Merge branch 'jc/merge-drop-old-syntax' into next
+ (this branch uses jc/merge-drop-old-syntax.)
Some "git notes" operations, e.g. "git log --notes=<note>", should
be able to read notes from any tree-ish that is shaped like a notes
when the operation would update the notes (in which case we must
have a place to store the updated notes tree, iow, a ref).
- Needs update to docs.
- ($gmane/273928)
-
* jc/diff-b-m (2015-02-23) 5 commits
. WIPWIP
--------------------------------------------------
[Cooking]
-* dt/refs-backend-lmdb (2015-10-05) 45 commits
- - SQUASH???
+* cc/quote-comments (2015-10-07) 2 commits
+ (merged to 'next' on 2015-10-09 at fc8a359)
+ + quote: move comment before sq_quote_buf()
+ + quote: fix broken sq_quote_buf() related comment
+
+ A no-op code-health maintenance.
+
+ Will merge to 'master'.
+
+
+* dt/log-follow-config (2015-10-07) 1 commit
+ (merged to 'next' on 2015-10-09 at 64a30d2)
+ + log: Update log.follow doc and add to config.txt
+
+ Description of the "log.follow" configuration variable in "git log"
+ documentation is now also copied to "git config" documentation.
+
+ Will merge to 'master'.
+
+
+* es/worktree-add-cleanup (2015-10-07) 1 commit
+ (merged to 'next' on 2015-10-09 at 6ffd721)
+ + t2026: rename worktree prune test
+
+ A no-op code-health maintenance.
+
+ Will merge to 'master'.
+
+
+* sg/pretty-more-date-mode-format (2015-10-07) 1 commit
+ - pretty: add format specifiers for short and raw date formats
+
+ Introduce "%as" and "%aR" placeholders for "log --format" to show
+ the author date in the short and raw formats.
+
+ I have a feeling that that this is a step in a wrong direction.
+
+
+* tk/doc-interpret-trailers-grammo (2015-10-07) 1 commit
+ (merged to 'next' on 2015-10-09 at 37888a2)
+ + Documentation/interpret-trailers: Grammar fix
+
+ Will merge to 'master'.
+
+
+* dt/refs-backend-lmdb (2015-10-12) 45 commits
- refs: tests for db backend
- refs: add LMDB refs backend
+ - introduce "extensions" form of core.repositoryformatversion
- refs: add register_refs_backend
- refs: allow ref backend to be set for clone
+ - refs: always handle non-normal refs in files backend
+ - refs: move duplicate check to common code
- refs: break out a ref conflict check
- - refs: make some files backend functions public
- - refs: move some defines from refs-be-files.c to refs.h
- - run-command: track total number of commands run
+ - refs: make files_log_ref_write functions public
+ - refs: make lock generic
- refs-be-files.c: add method to rename refs
- - refs.c: make struct ref_transaction generic
- refs.c: add method for initializing refs db
- initdb: move safe_create_dir into common code
- refs.c: add method for initial ref transaction commit
- - refs-be-files.c: add method to expire reflogs
- refs.c: add methods for reflog
- refs.c: add ref backend init function
- refs.c: move should_autocreate_reflog to common code
- refs-be-files.c: add method for for_each_reftype_...
- refs-be-files.c: add methods for the ref iterators
- refs-be-files.c: add methods for misc ref operations
- - refs-be-files.c: add a backend method structure with transaction functions
+ - refs: add a backend method structure with transaction functions
+ - refs: move transaction functions into common code
- refs.c: move head_ref_namespaced to the common code
- refs.c: move ref iterators to the common code
- refs.c: move prettify_refname to the common code
Pluggable ref backend.
- Expecting a reroll.
- ($gmane/278757).
+ Expecting a reroll (as two parts series).
* gr/rebase-i-drop-warn (2015-10-05) 2 commits
- - rebase-i: loosen over-eager check_bad_cmd check
- - rebase-i: explicitly accept tab as separator in commands
+ (merged to 'next' on 2015-10-09 at 0626b96)
+ + rebase-i: loosen over-eager check_bad_cmd check
+ + rebase-i: explicitly accept tab as separator in commands
"git rebase -i" had a minor regression recently, which stopped
considering a line that begins with an indented '#' in its insn
sheet not a comment, which is now fixed.
- Will merge to 'next'.
+ Will merge to 'master'.
* kn/for-each-branch-remainder (2015-10-02) 9 commits
($gmane/278926)
-* pt/pull-builtin (2015-10-02) 1 commit
- (merged to 'next' on 2015-10-07 at 19af20e)
- + merge: grammofix in please-commit-before-merge message
-
- Will merge to 'master'.
-
-
-* jk/asciidoctor-section-heading-markup-fix (2015-09-25) 1 commit
- (merged to 'next' on 2015-10-07 at 8bbff49)
- + Documentation: fix section header mark-up
-
- Will merge to 'master'.
-
-
* jk/war-on-sprintf (2015-10-05) 70 commits
- name-rev: use strip_suffix to avoid magic numbers
- use strbuf_complete to conditionally append slash
* sb/http-flaky-test-fix (2015-09-25) 1 commit
- - t5561: get rid of racy appending to logfile
+ (merged to 'next' on 2015-10-09 at 9dc37f3)
+ + t5561: get rid of racy appending to logfile
- Will merge to 'next'.
+ Will merge to 'master'.
* sb/perf-without-installed-git (2015-09-25) 1 commit
- - t/perf: make runner work even if Git is not installed
+ (merged to 'next' on 2015-10-09 at 7a1ed05)
+ + t/perf: make runner work even if Git is not installed
Performance-measurement tests did not work without an installed Git.
- Will merge to 'next'.
-
-
-* tk/typofix-connect-unknown-proto-error (2015-09-25) 1 commit
- (merged to 'next' on 2015-10-07 at cc3430e)
- + connect: fix typo in result string of prot_name()
-
Will merge to 'master'.
* js/clone-dissociate (2015-10-07) 4 commits
- - clone --dissociate: avoid locking pack files
- - sha1_file.c: add a function to release all packs
- - sha1_file: consolidate code to close a pack's file descriptor
- - t5700: demonstrate a Windows file locking issue with `git clone --dissociate`
+ (merged to 'next' on 2015-10-09 at ba30393)
+ + clone --dissociate: avoid locking pack files
+ + sha1_file.c: add a function to release all packs
+ + sha1_file: consolidate code to close a pack's file descriptor
+ + t5700: demonstrate a Windows file locking issue with `git clone --dissociate`
"git clone --dissociate" runs a big "git repack" process at the
end, and it helps to close file descriptors that are open on the
packs and their idx files before doing so on filesystems that
cannot remove a file that is still open.
- Will merge to 'next'.
+ Will merge to 'master'.
-* js/gc-with-stale-symref (2015-10-05) 2 commits
- - pack-objects: do not get distracted by broken symrefs
- - gc: demonstrate failure with stale remote HEAD
+* js/gc-with-stale-symref (2015-10-08) 2 commits
+ (merged to 'next' on 2015-10-09 at 8b89576)
+ + pack-objects: do not get distracted by broken symrefs
+ + gc: demonstrate failure with stale remote HEAD
"git gc" used to barf when a symbolic ref has gone dangling
(e.g. the branch that used to be your upstream's default when you
cloned from it is now gone, and you did "fetch --prune").
- Will merge to 'next'.
+ Will merge to 'master'.
* js/icase-wt-detection (2015-09-28) 1 commit
- - setup: fix "inside work tree" detection on case-insensitive filesystems
+ (merged to 'next' on 2015-10-09 at 78ff500)
+ + setup: fix "inside work tree" detection on case-insensitive filesystems
- Will merge to 'next'.
+ Will merge to 'master'.
* mm/detach-at-HEAD-reflog (2015-10-02) 2 commits
- - status: don't say 'HEAD detached at HEAD'
- - t3203: test 'detached at' after checkout --detach
-
- Will merge to 'next'.
+ (merged to 'next' on 2015-10-09 at 624bc87)
+ + status: don't say 'HEAD detached at HEAD'
+ + t3203: test 'detached at' after checkout --detach
-
-* nd/ls-remote-does-not-have-u-option (2015-09-28) 1 commit
- (merged to 'next' on 2015-10-07 at 0790a76)
- + ls-remote.txt: delete unsupported option
+ After "git checkout --detach", "git status" reported a fairly
+ useless "HEAD detached at HEAD", instead of saying at which exact
+ commit.
Will merge to 'master'.
* pt/am-builtin (2015-09-30) 1 commit
- - am: configure gpg at startup
+ (merged to 'next' on 2015-10-09 at 396def8)
+ + am: configure gpg at startup
When "git am" was rewritten as a built-in, it stopped paying
attention to user.signingkey.
- Will merge to 'next'.
+ Will merge to 'master'.
* sa/send-email-smtp-batch-data-limit (2015-09-30) 1 commit
- - git-send-email.perl: Fixed sending of many/huge changes/patches
+ (merged to 'next' on 2015-10-09 at c021fdf)
+ + git-send-email.perl: Fixed sending of many/huge changes/patches
When "git send-email" wanted to talk over Net::SMTP::SSL,
Net::Cmd::datasend() did not like to be fed too many bytes at the
same time and failed to send messages. Send the payload one line
at a time to work around the problem.
- Will merge to 'next'.
+ Will merge to 'master'.
* ls/p4-translation-failure (2015-09-22) 2 commits
- - git-p4: handle "Translation of file content failed"
- - git-p4: add test case for "Translation of file content failed" error
+ (merged to 'next' on 2015-10-09 at b462387)
+ + git-p4: handle "Translation of file content failed"
+ + git-p4: add test case for "Translation of file content failed" error
Work around "git p4" failing when the P4 depot records the contents
in UTF-16 without UTF-16 BOM.
- Will merge to 'next'.
-
-
-* jk/notes-dwim-doc (2015-09-22) 1 commit
- (merged to 'next' on 2015-10-07 at c4341d1)
- + notes: correct documentation of DWIMery for notes references
-
- The way how --ref/--notes to specify the notes tree reference are
- DWIMmed was not clearly documented.
-
Will merge to 'master'.
* kn/for-each-branch (2015-09-25) 8 commits
- - branch: add '--points-at' option
- - branch.c: use 'ref-filter' APIs
- - branch.c: use 'ref-filter' data structures
- - branch: drop non-commit error reporting
- - branch: move 'current' check down to the presentation layer
- - branch: roll show_detached HEAD into regular ref_list
- - branch: bump get_head_description() to the top
- - branch: refactor width computation
+ (merged to 'next' on 2015-10-09 at 45723ce)
+ + branch: add '--points-at' option
+ + branch.c: use 'ref-filter' APIs
+ + branch.c: use 'ref-filter' data structures
+ + branch: drop non-commit error reporting
+ + branch: move 'current' check down to the presentation layer
+ + branch: roll show_detached HEAD into regular ref_list
+ + branch: bump get_head_description() to the top
+ + branch: refactor width computation
(this branch is used by kn/for-each-branch-remainder.)
Update "git branch" that list existing branches, using the
ref-filter API that is shared with "git tag" and "git
for-each-ref".
- Will merge to 'next'.
+ Will merge to 'master'.
* jc/fsck-dropped-errors (2015-09-23) 1 commit
- - fsck: exit with non-zero when problems are found
+ (merged to 'next' on 2015-10-09 at 887fcac)
+ + fsck: exit with non-zero when problems are found
There were some classes of errors that "git fsck" diagnosed to its
standard error that did not cause it to exit with non-zero status.
- Will merge to 'next'.
+ Will merge to 'master'.
* nd/gc-auto-background-fix (2015-09-21) 1 commit
- - gc: save log from daemonized gc --auto and print it next time
+ (merged to 'next' on 2015-10-09 at 1f0fc60)
+ + gc: save log from daemonized gc --auto and print it next time
When "git gc --auto" is backgrounded, its diagnosis message is
lost. Save it to a file in $GIT_DIR and show it next time the "gc
--auto" is run.
- Will merge to 'next'.
+ Will merge to 'master'.
* jk/graph-format-padding (2015-09-14) 1 commit
($gmane/278326)
-* sb/submodule-parallel-fetch (2015-10-02) 8 commits
+* sb/submodule-parallel-fetch (2015-10-12) 8 commits
- submodules: allow parallel fetching, add tests and documentation
- fetch_populated_submodules: use new parallel job processing
- run-command: add an asynchronous parallel child processor
Add a framework to spawn a group of processes in parallel, and use
it to run "git fetch --recurse-submodules" in parallel.
- The overall structure seems more-or-less sensible.
- ($gmane/278873)
-
Will merge to 'next'.
* mk/submodule-gitdir-path (2015-09-14) 2 commits
- - path: implement common_dir handling in git_pathdup_submodule()
- - submodule refactor: use strbuf_git_path_submodule() in add_submodule_odb()
+ (merged to 'next' on 2015-10-09 at cf8768e)
+ + path: implement common_dir handling in git_pathdup_submodule()
+ + submodule refactor: use strbuf_git_path_submodule() in add_submodule_odb()
The submodule code has been taught to work better with separate
work trees created via "git worktree add".
- Will merge to 'next'.
+ Will merge to 'master'.
* ls/p4-lfs (2015-10-03) 7 commits
- - git-p4: add Git LFS backend for large file system
- - git-p4: add support for large file systems
- - git-p4: check free space during streaming
- - git-p4: add file streaming progress in verbose mode
- - git-p4: return an empty list if a list config has no values
- - git-p4: add gitConfigInt reader
- - git-p4: add optional type specifier to gitConfig reader
+ (merged to 'next' on 2015-10-14 at 4b8c365)
+ + git-p4: add Git LFS backend for large file system
+ + git-p4: add support for large file systems
+ + git-p4: check free space during streaming
+ + git-p4: add file streaming progress in verbose mode
+ + git-p4: return an empty list if a list config has no values
+ + git-p4: add gitConfigInt reader
+ + git-p4: add optional type specifier to gitConfig reader
Teach "git p4" to send large blobs outside the repository by
talking to Git LFS.
- Will merge to 'next'.
+ Will merge to 'master'.
* nd/clone-linked-checkout (2015-09-28) 6 commits
- - clone: better error when --reference is a linked checkout
- - clone: allow --local from a linked checkout
- - enter_repo: allow .git files in strict mode
- - enter_repo: avoid duplicating logic, use is_git_directory() instead
- - t0002: add test for enter_repo(), non-strict mode
- - path.c: delete an extra space
+ (merged to 'next' on 2015-10-09 at a93973f)
+ + clone: better error when --reference is a linked checkout
+ + clone: allow --local from a linked checkout
+ + enter_repo: allow .git files in strict mode
+ + enter_repo: avoid duplicating logic, use is_git_directory() instead
+ + t0002: add test for enter_repo(), non-strict mode
+ + path.c: delete an extra space
It was not possible to use a repository-lookalike created by "git
worktree add" as a local source of "git clone".
- Will merge to 'next'.
+ Will merge to 'master'.
* ad/cygwin-wants-rename (2015-08-07) 1 commit
* jc/merge-drop-old-syntax (2015-04-29) 1 commit
(merged to 'next' on 2015-10-07 at 50fed71)
+ merge: drop 'git merge <message> HEAD <commit>' syntax
+ (this branch is used by mh/notes-allow-reading-treeish.)
Originally merged to 'next' on 2015-05-28
projects / thirdparty / git.git / commitdiff
