What's cooking in git.git (Sep 2017, #03; Fri, 15)

What's cooking in git.git (Sep 2017, #03; Fri, 15)

[Junio C Hamano]

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 ones marked with '.' do not appear in any of
the integration branches, but I am still holding onto them.

We are at week #6 of this cycle.  It seems that people had a
productive week while I was away, which I am reasonably happy about
;-)  Quite a many topics that have been in 'master' are now also
merged to 'maint', so perhaps I should tag 2.14.2 soonish.

You can find the changes described here in the integration branches
of the repositories listed at

    http://git-blame.blogspot.com/p/git-public-repositories.html

--------------------------------------------------
[New Topics]

* cc/subprocess-handshake-missing-capabilities (2017-09-11) 1 commit
 - subprocess: loudly die when subprocess asks for an unsupported capability

 Finishing touches to a topic already in 'master'.

 Will merge to 'next'.


* bw/protocol-v1 (2017-09-14) 8 commits
 - i5700: add interop test for protocol transition
 - http: tell server that the client understands v1
 - connect: tell server that the client understands v1
 - connect: teach client to recognize v1 server response
 - upload-pack, receive-pack: introduce protocol version 1
 - daemon: recognize hidden request arguments
 - protocol: introduce protocol extention mechanisms
 - pkt-line: add packet_write function

 A new mechanism to upgrade the wire protocol in place is proposed
 and demonstrated that it works with the older versions of Git
 without harming them.


* ez/doc-duplicated-words-fix (2017-09-14) 1 commit
 - doc: fix minor typos (extra/duplicated words)

 Typofix.

 Will merge to 'next'.


* jk/write-in-full-fix (2017-09-14) 8 commits
 - read_pack_header: handle signed/unsigned comparison in read result
 - config: flip return value of store_write_*()
 - notes-merge: use ssize_t for write_in_full() return value
 - pkt-line: check write_in_full() errors against "< 0"
 - convert less-trivial versions of "write_in_full() != len"
 - avoid "write_in_full(fd, buf, len) != len" pattern
 - get-tar-commit-id: check write_in_full() return against 0
 - config: avoid "write_in_full(fd, buf, len) < len" pattern

 Many codepaths did not diagnose write failures correctly when disks
 go full, due to their misuse of write_in_full() helper function,
 which have been corrected.

 Will merge to 'next'.


* jn/per-repo-object-store-fixes (2017-09-14) 3 commits
 - replace-objects: evaluate replacement refs without using the object store
 - push, fetch: error out for submodule entries not pointing to commits
 - pack: make packed_git_mru global a value instead of a pointer

 Step #0 of a planned & larger series.

 Will merge to 'next'.


* ks/commit-do-not-touch-cut-line (2017-09-15) 1 commit
 - commit-template: change a message to be more intuitive

 The explanation of the cut-line in the commit log editor has been
 slightly tweaked.

 Will merge to 'next'.


* ks/help-alias-label (2017-09-14) 1 commit
 - help: change a message to be more precise

 "git help co" now says "co is aliased to ...", not "git co is".

 Will merge to 'next'.


* mh/mmap-packed-refs (2017-09-14) 20 commits
 - packed-backend.c: rename a bunch of things and update comments
 - mmapped_ref_iterator: inline into `packed_ref_iterator`
 - ref_cache: remove support for storing peeled values
 - packed_ref_store: get rid of the `ref_cache` entirely
 - ref_store: implement `refs_peel_ref()` generically
 - packed_read_raw_ref(): read the reference from the mmapped buffer
 - packed_ref_iterator_begin(): iterate using `mmapped_ref_iterator`
 - read_packed_refs(): ensure that references are ordered when read
 - packed_ref_cache: keep the `packed-refs` file open and mmapped
 - mmapped_ref_iterator_advance(): no peeled value for broken refs
 - mmapped_ref_iterator: add iterator over a packed-refs file
 - packed_ref_cache: remember the file-wide peeling state
 - read_packed_refs(): read references with minimal copying
 - read_packed_refs(): make parsing of the header line more robust
 - read_packed_refs(): only check for a header at the top of the file
 - read_packed_refs(): use mmap to read the `packed-refs` file
 - die_unterminated_line(), die_invalid_line(): new functions
 - packed_ref_cache: add a backlink to the associated `packed_ref_store`
 - prefix_ref_iterator: break when we leave the prefix
 - ref_iterator: keep track of whether the iterator output is ordered
 (this branch uses mh/packed-ref-transactions.)

 Operations that do not touch (majority of) packed refs have been
 optimized by making accesses to packed-refs file lazy; we no longer
 pre-parse everything, and an access to a single ref in the
 packed-refs does not touch majority of irrelevant refs, either.

 Expecting a rework to also work on Windows.


* nm/imap-send-with-curl (2017-09-15) 4 commits
 - imap-send: use curl by default when possible
 - imap_send: setup_curl: retreive credentials if not set in config file
 - imap-send: add wrapper to get server credentials if needed
 - imap-send: return with error if curl failed

 "git imap-send" has our own implementation of the protocol and also
 can use more recent libCurl with the imap protocol support.  Update
 the latter so that it can use the credential subsystem, and then
 make it the default option to use, so that we can eventually
 deprecate and remove the former.

 Will merge to 'next'.


* rj/test-ulimit-on-windows (2017-09-15) 1 commit
 - test-lib: don't use ulimit in test prerequisites on cygwin
 (this branch uses mg/name-rev-tests-with-short-stack.)

 On Cygwin, "ulimit -s" does not report failure but it does not work
 at all, which causes an unexpected success of some tests that
 expect failures under a limited stack situation.  This has been
 fixed.

 Will merge to 'next'.


* rs/archive-excluded-directory (2017-09-14) 1 commit
 - archive: don't add empty directories to archives

 "git archive", especially when used with pathspec, stored an empty
 directory in its output, even though Git itself never does so.
 This has been fixed.

 Will merge to 'next'.


* tg/refs-allowed-flags (2017-09-14) 1 commit
 - refs: strip out not allowed flags from ref_transaction_update

 API error-proofing which happens to also squelch warnings from GCC.

 Will merge to 'next'.

--------------------------------------------------
[Stalled]

* mg/status-in-progress-info (2017-05-10) 2 commits
 - status --short --inprogress: spell it as --in-progress
 - status: show in-progress info for short status

 "git status" learns an option to report various operations
 (e.g. "merging") that the user is in the middle of.

 cf. <xmqqmvakcdqw.fsf@gitster.mtv.corp.google.com>


* nd/worktree-move (2017-04-20) 6 commits
 - worktree remove: new command
 - worktree move: refuse to move worktrees with submodules
 - worktree move: accept destination as directory
 - worktree move: new command
 - worktree.c: add update_worktree_location()
 - worktree.c: add validate_worktree()

 "git worktree" learned move and remove subcommands.

 Expecting a reroll.
 cf. <20170420101024.7593-1-pclouds@gmail.com>
 cf. <20170421145916.mknekgqzhxffu7di@sigill.intra.peff.net>
 cf. <d0e81b1e-5869-299e-f462-4d43dc997bd1@ramsayjones.plus.com>


* sg/clone-refspec-from-command-line-config (2017-06-16) 2 commits
 - Documentation/clone: document ignored configuration variables
 - clone: respect additional configured fetch refspecs during initial fetch
 (this branch is used by sg/remote-no-string-refspecs.)

 "git clone -c var=val" is a way to set configuration variables in
 the resulting repository, but it is more useful to also make these
 variables take effect while the initial clone is happening,
 e.g. these configuration variables could be fetch refspecs.

 Waiting for a response.
 cf. <20170617112228.vugswym4o4owf6wj@sigill.intra.peff.net>
 cf. <xmqqmv8zhdap.fsf@gitster.mtv.corp.google.com>


* js/rebase-i-final (2017-07-27) 10 commits
 - rebase -i: rearrange fixup/squash lines using the rebase--helper
 - t3415: test fixup with wrapped oneline
 - rebase -i: skip unnecessary picks using the rebase--helper
 - rebase -i: check for missing commits in the rebase--helper
 - t3404: relax rebase.missingCommitsCheck tests
 - rebase -i: also expand/collapse the SHA-1s via the rebase--helper
 - rebase -i: do not invent onelines when expanding/collapsing SHA-1s
 - rebase -i: remove useless indentation
 - rebase -i: generate the script via rebase--helper
 - t3415: verify that an empty instructionFormat is handled as before

 The final batch to "git rebase -i" updates to move more code from
 the shell script to C.

 Expecting a reroll.


* bp/fsmonitor (2017-06-12) 6 commits
 - fsmonitor: add a sample query-fsmonitor hook script for Watchman
 - fsmonitor: add documentation for the fsmonitor extension.
 - fsmonitor: add test cases for fsmonitor extension
 - fsmonitor: teach git to optionally utilize a file system monitor to speed up detecting new or changed files.
 - dir: make lookup_untracked() available outside of dir.c
 - bswap: add 64 bit endianness helper get_be64

 We learned to talk to watchman to speed up "git status".

 Expecting a reroll.
 cf. <bade1166-e646-b05a-f65b-adb8da8ba0a7@gmail.com>

--------------------------------------------------
[Cooking]

* bb/doc-eol-dirty (2017-09-07) 1 commit
  (merged to 'next' on 2017-09-14 at 2f0cb688c6)
 + Documentation: mention that `eol` can change the dirty status of paths

 Doc update.

 Will merge to 'master'.


* jh/hashmap-disable-counting (2017-09-07) 1 commit
  (merged to 'next' on 2017-09-14 at bbc08f4222)
 + hashmap: add API to disable item counting when threaded

 Our hashmap implementation in hashmap.[ch] is not thread-safe when
 adding a new item needs to expand the hashtable by rehashing; add
 an API to disable the automatic rehashing to work it around.

 Will merge to 'master'.


* jk/incore-lockfile-removal (2017-09-06) 20 commits
  (merged to 'next' on 2017-09-14 at 603dae7fb2)
 + stop leaking lock structs in some simple cases
 + ref_lock: stop leaking lock_files
 + lockfile: update lifetime requirements in documentation
 + tempfile: auto-allocate tempfiles on heap
 + tempfile: remove deactivated list entries
 + tempfile: use list.h for linked list
 + tempfile: release deactivated strbufs instead of resetting
 + tempfile: robustify cleanup handler
 + tempfile: factor out deactivation
 + tempfile: factor out activation
 + tempfile: replace die("BUG") with BUG()
 + tempfile: handle NULL tempfile pointers gracefully
 + tempfile: prefer is_tempfile_active to bare access
 + lockfile: do not rollback lock on failed close
 + tempfile: do not delete tempfile on failed close
 + always check return value of close_tempfile
 + verify_signed_buffer: prefer close_tempfile() to close()
 + setup_temporary_shallow: move tempfile struct into function
 + setup_temporary_shallow: avoid using inactive tempfile
 + write_index_as_tree: cleanup tempfile on error

 The long-standing rule that an in-core lockfile instance, once it
 is used, must not be freed, has been lifted and the lockfile and
 tempfile APIs have been updated to reduce the chance of programming
 errors.

 Will merge to 'master'.


* jk/leak-checkers (2017-09-08) 10 commits
  (merged to 'next' on 2017-09-14 at 906ed9f590)
 + add UNLEAK annotation for reducing leak false positives
 + set_git_dir: handle feeding gitdir to itself
 + repository: free fields before overwriting them
 + reset: free allocated tree buffers
 + reset: make tree counting less confusing
 + config: plug user_config leak
 + update-index: fix cache entry leak in add_one_file()
 + add: free leaked pathspec after add_files_to_cache()
 + test-lib: set LSAN_OPTIONS to abort by default
 + test-lib: --valgrind should not override --verbose-log

 Many of our programs consider that it is OK to release dynamic
 storage that is used throughout the life of the program by simply
 exiting, but this makes it harder to leak detection tools to avoid
 reporting false positives.  Plug many existing leaks and introduce
 a mechanism for developers to mark that the region of memory
 pointed by a pointer is not lost/leaking to help these tools.

 Will merge to 'master'.


* jk/system-path-cleanup (2017-09-07) 2 commits
  (merged to 'next' on 2017-09-14 at c6faaf8858)
 + git_extract_argv0_path: do nothing without RUNTIME_PREFIX
 + system_path: move RUNTIME_PREFIX to a sub-function

 Code clean-up.

 Will merge to 'master'.


* jt/packmigrate (2017-09-06) 1 commit
  (merged to 'next' on 2017-09-14 at 169e9573a0)
 + Remove inadvertently added outgoing/packfile.h

 An oops fix.

 Will merge to 'master'.


* kd/doc-for-each-ref (2017-09-12) 2 commits
 - doc/for-each-ref: explicitly specify option names
 - doc/for-each-ref: consistently use '=' to between argument names and values

 Doc update.

 Will merge to 'next'.


* kw/write-index-reduce-alloc (2017-09-08) 2 commits
 - read-cache: fix index corruption with index v4
 - Add t/helper/test-write-cache to .gitignore

 Will merge to 'next'.


* ma/remove-config-maybe-bool (2017-09-07) 1 commit
  (merged to 'next' on 2017-09-14 at d0c7fb97a9)
 + config: remove git_config_maybe_bool

 Finishing touches to a recent topic.

 Will merge to 'master'.


* mh/packed-ref-store-prep (2017-09-07) 1 commit
  (merged to 'next' on 2017-09-14 at e3ef821847)
 + rev-parse: don't trim bisect refnames

 Finishing touches to a recent topic.

 Will merge to 'master'.


* mh/packed-ref-transactions (2017-09-09) 11 commits
  (merged to 'next' on 2017-09-14 at b926200d45)
 + files_transaction_finish(): delete reflogs before references
 + packed-backend: rip out some now-unused code
 + files_ref_store: use a transaction to update packed refs
 + t1404: demonstrate two problems with reference transactions
 + files_initial_transaction_commit(): use a transaction for packed refs
 + prune_refs(): also free the linked list
 + files_pack_refs(): use a reference transaction to write packed refs
 + packed_delete_refs(): implement method
 + packed_ref_store: implement reference transactions
 + struct ref_transaction: add a place for backends to store data
 + packed-backend: don't adjust the reference count on lock/unlock
 (this branch is used by mh/mmap-packed-refs.)

 Implement transactional update to the packed-ref representation of
 references.

 Will merge to 'master'.


* nm/pull-submodule-recurse-config (2017-09-07) 2 commits
  (merged to 'next' on 2017-09-14 at 38bf2c88e0)
 + pull: honor submodule.recurse config option
 + pull: fix cli and config option parsing order

 "git -c submodule.recurse=yes pull" did not work as if the
 "--recurse-submodules" option was given from the command line.
 This has been corrected.

 Will merge to 'master'.


* rs/strbuf-leakfix (2017-09-10) 34 commits
  (merged to 'next' on 2017-09-14 at bb46952e6a)
 + wt-status: release strbuf after use in wt_longstatus_print_tracking()
 + wt-status: release strbuf after use in read_rebase_todolist()
 + vcs-svn: release strbuf after use in end_revision()
 + utf8: release strbuf on error return in strbuf_utf8_replace()
 + userdiff: release strbuf after use in userdiff_get_textconv()
 + transport-helper: release strbuf after use in process_connect_service()
 + sequencer: release strbuf after use in save_head()
 + shortlog: release strbuf after use in insert_one_record()
 + sha1_file: release strbuf on error return in index_path()
 + send-pack: release strbuf on error return in send_pack()
 + remote: release strbuf after use in set_url()
 + remote: release strbuf after use in migrate_file()
 + remote: release strbuf after use in read_remote_branches()
 + refs: release strbuf on error return in write_pseudoref()
 + notes: release strbuf after use in notes_copy_from_stdin()
 + merge: release strbuf after use in write_merge_heads()
 + merge: release strbuf after use in save_state()
 + mailinfo: release strbuf on error return in handle_boundary()
 + mailinfo: release strbuf after use in handle_from()
 + help: release strbuf on error return in exec_woman_emacs()
 + help: release strbuf on error return in exec_man_man()
 + help: release strbuf on error return in exec_man_konqueror()
 + diff: release strbuf after use in show_stats()
 + diff: release strbuf after use in show_rename_copy()
 + diff: release strbuf after use in diff_summary()
 + convert: release strbuf on error return in filter_buffer_or_fd()
 + connect: release strbuf on error return in git_connect()
 + commit: release strbuf on error return in commit_tree_extended()
 + clone: release strbuf after use in remove_junk()
 + clean: release strbuf after use in remove_dirs()
 + check-ref-format: release strbuf after use in check_ref_format_branch()
 + am: release strbuf after use in safe_to_abort()
 + am: release strbuf on error return in hg_patch_to_mail()
 + am: release strbufs after use in detect_patch_format()

 Many leaks of strbuf have been fixed.

 Will merge to 'master'.


* jk/shortlog-ident-cleanup (2017-09-09) 1 commit
  (merged to 'next' on 2017-09-14 at 09695b6c39)
 + shortlog: skip format/parse roundtrip for internal traversal

 Code clean-up.

 Will merge to 'master'.


* mg/name-rev-tests-with-short-stack (2017-09-08) 4 commits
  (merged to 'next' on 2017-09-14 at 1e4a0fe206)
 + t6120: test describe and name-rev with deep repos
 + t6120: clean up state after breaking repo
 + t6120: test name-rev --all and --stdin
 + t7004: move limited stack prereq to test-lib
 (this branch is used by rj/test-ulimit-on-windows.)

 A handful of tests to demonstrates a recursive implementation of
 "name-rev" hurts.

 Will merge to 'master'.


* rk/commit-tree-make-F-verbatim (2017-09-10) 1 commit
  (merged to 'next' on 2017-09-14 at 3d40c900f3)
 + commit-tree: do not complete line in -F input

 Unlike "git commit-tree < file", "git commit-tree -F file" did not
 pass the contents of the file verbatim and instead completed an
 incomplete line at the end, if exists.  The latter has been updated
 to match the behaviour of the former.

 Will merge to 'master'.


* sb/merge-commit-msg-hook (2017-09-08) 1 commit
  (merged to 'next' on 2017-09-14 at e9d0e43031)
 + builtin/merge: honor commit-msg hook for merges

 As "git commit" to conclude a conflicted "git merge" honors the
 commit-msg hook, "git merge" that recoreds a merge commit that
 cleanly auto-merges should, but it didn't.

 Will merge to 'master'.


* ls/travis-scriptify (2017-09-11) 3 commits
  (merged to 'next' on 2017-09-14 at 8fa685d3b7)
 + travis: dedent a few scripts that are indented overly deeply
 + travis-ci: skip a branch build if equal tag is present
 + travis-ci: move Travis CI code into dedicated scripts

 The scripts to drive TravisCI has been reorganized and then an
 optimization to avoid spending cycles on a branch whose tip is
 tagged has been implemented.

 Will merge to 'master'.


* dw/diff-highlight-makefile-fix (2017-09-06) 1 commit
  (merged to 'next' on 2017-09-10 at 8dfda480ac)
 + diff-highlight: add clean target to Makefile

 Build clean-up.

 Will merge to 'master'.


* jk/config-lockfile-leak-fix (2017-09-06) 1 commit
  (merged to 'next' on 2017-09-10 at 7b91d71749)
 + config: use a static lock_file struct

 A leakfix.

 Will merge to 'master'.


* kw/merge-recursive-cleanup (2017-09-08) 3 commits
  (merged to 'next' on 2017-09-14 at 9f20025e6b)
 + merge-recursive: change current file dir string_lists to hashmap
 + merge-recursive: remove return value from get_files_dirs
 + merge-recursive: fix memory leak

 A leakfix and code clean-up.

 Will merge to 'master'.


* ma/pkt-line-leakfix (2017-09-06) 1 commit
  (merged to 'next' on 2017-09-10 at f0d9994319)
 + pkt-line: re-'static'-ify buffer in packet_write_fmt_1()

 A leakfix.

 Will merge to 'master'.


* ma/split-symref-update-fix (2017-09-10) 4 commits
  (merged to 'next' on 2017-09-10 at 96c403fca7)
 + refs/files-backend: add `refname`, not "HEAD", to list
 + refs/files-backend: correct return value in lock_ref_for_update
 + refs/files-backend: fix memory leak in lock_ref_for_update
 + refs/files-backend: add longer-scoped copy of string to list

 A leakfix.

 Will merge to 'master'.


* mg/timestamp-t-fix (2017-09-06) 1 commit
  (merged to 'next' on 2017-09-10 at a5df4d5b3e)
 + name-rev: change ULONG_MAX to TIME_MAX

 A mismerge fix.

 Will merge to 'master'.


* pc/submodule-helper (2017-08-25) 4 commits
 - submodule: port submodule subcommand 'status' from shell to C
 - submodule: port set_name_rev() from shell to C
 - submodule--helper: introduce for_each_listed_submodule()
 - submodule--helper: introduce get_submodule_displaypath()

 GSoC.


* sb/parse-options-blank-line-before-option-list (2017-08-25) 1 commit
 - usage_with_options: omit double new line on empty option list

 "git worktree" with no option and no subcommand showed too many
 blank lines in its help text, which has been reduced.


* mh/notes-cleanup (2017-09-09) 13 commits
  (merged to 'next' on 2017-09-10 at cb1d725504)
 + load_subtree(): check that `prefix_len` is in the expected range
  (merged to 'next' on 2017-08-26 at 2d6df46966)
 + load_subtree(): declare some variables to be `size_t`
 + hex_to_bytes(): simpler replacement for `get_oid_hex_segment()`
 + get_oid_hex_segment(): don't pad the rest of `oid`
 + load_subtree(): combine some common code
 + get_oid_hex_segment(): return 0 on success
 + load_subtree(): only consider blobs to be potential notes
 + load_subtree(): check earlier whether an internal node is a tree entry
 + load_subtree(): separate logic for internal vs. terminal entries
 + load_subtree(): fix incorrect comment
 + load_subtree(): reduce the scope of some local variables
 + load_subtree(): remove unnecessary conditional
 + notes: make GET_NIBBLE macro more robust

 Code clean-up.

 Will merge to 'master'.


* nd/prune-in-worktree (2017-08-24) 16 commits
  (merged to 'next' on 2017-09-14 at 3efe283118)
 + refs.c: reindent get_submodule_ref_store()
 + refs.c: remove fallback-to-main-store code get_submodule_ref_store()
 + rev-list: expose and document --single-worktree
 + revision.c: --reflog add HEAD reflog from all worktrees
 + files-backend: make reflog iterator go through per-worktree reflog
 + revision.c: --all adds HEAD from all worktrees
 + refs: remove dead for_each_*_submodule()
 + refs.c: move for_each_remote_ref_submodule() to submodule.c
 + revision.c: use refs_for_each*() instead of for_each_*_submodule()
 + refs: add refs_head_ref()
 + refs: move submodule slash stripping code to get_submodule_ref_store
 + refs.c: refactor get_submodule_ref_store(), share common free block
 + revision.c: --indexed-objects add objects from all worktrees
 + revision.c: refactor add_index_objects_to_pending()
 + refs.c: use is_dir_sep() in resolve_gitlink_ref()
 + revision.h: new flag in struct rev_info wrt. worktree-related refs

 "git gc" and friends when multiple worktrees are used off of a
 single repository did not consider the index and per-worktree refs
 of other worktrees as the root for reachability traversal, making
 objects that are in use only in other worktrees to be subject to
 garbage collection.

 Will merge to 'master'.


* bc/hash-algo (2017-08-20) 5 commits
 - hash-algo: switch empty tree and blob lookups to use hash abstraction
 - hash-algo: integrate hash algorithm support with repo setup
 - hash-algo: add structure representing hash algorithm
 - setup: expose enumerated repo info
 - Merge branch 'bc/vcs-svn-cleanup' into bc/hash-algo

 RFC
 cf. <20170821000022.26729-1-sandals@crustytoothpaste.net>


* mk/diff-delta-uint-may-be-shorter-than-ulong (2017-08-10) 1 commit
 . diff-delta: fix encoding size that would not fit in "unsigned int"

 The machinery to create xdelta used in pack files received the
 sizes of the data in size_t, but lost the higher bits of them by
 storing them in "unsigned int" during the computation, which is
 fixed.

 Dropped, as it was rerolled for review as part of a larger series.
 cf. <1502914591-26215-1-git-send-email-martin@mail.zuhause>


* jk/drop-ancient-curl (2017-08-09) 5 commits
 - http: #error on too-old curl
 - curl: remove ifdef'd code never used with curl >=7.19.4
 - http: drop support for curl < 7.19.4
 - http: drop support for curl < 7.16.0
 - http: drop support for curl < 7.11.1

 Some code in http.c that has bitrot is being removed.

 Will be rerolled after tc/curl-with-backports stabilizes.


* mk/use-size-t-in-zlib (2017-08-10) 1 commit
 . zlib.c: use size_t for size

 The wrapper to call into zlib followed our long tradition to use
 "unsigned long" for sizes of regions in memory, which have been
 updated to use "size_t".

 Dropped, as it was rerolled for review as part of a larger series.
 cf. <1502914591-26215-1-git-send-email-martin@mail.zuhause>


* mk/diff-delta-avoid-large-offset (2017-08-11) 1 commit
 . diff-delta: do not allow delta offset truncation

 The delta format used in the packfile cannot reference data at
 offset larger than what can be expressed in 4-byte, but the
 generator for the data failed to make sure the offset does not
 overflow.  This has been corrected.

 Dropped, as it was rerolled for review as part of a larger series.
 cf. <1502914591-26215-1-git-send-email-martin@mail.zuhause>


* bw/git-clang-format (2017-08-14) 2 commits
 - Makefile: add style build rule
 - clang-format: outline the git project's coding style

 "make style" runs git-clang-format to help developers by pointing
 out coding style issues.


* sb/submodule-recursive-checkout-detach-head (2017-07-28) 2 commits
 - Documentation/checkout: clarify submodule HEADs to be detached
 - recursive submodules: detach HEAD from new state

 "git checkout --recursive" may overwrite and rewind the history of
 the branch that happens to be checked out in submodule
 repositories, which might not be desirable.  Detach the HEAD but
 still allow the recursive checkout to succeed in such a case.

 Undecided.
 This needs justification in a larger picture; it is unclear why
 this is better than rejecting recursive checkout, for example.


* ti/external-sha1dc (2017-08-16) 2 commits
  (merged to 'next' on 2017-08-26 at a0fb4e91a5)
 + sha1dc: allow building with the external sha1dc library
 + sha1dc: build git plumbing code more explicitly

 Platforms that ship with a separate sha1 with collision detection
 library can link to it instead of using the copy we ship as part of
 our source tree.

 Will merge to 'master'.


* jk/check-ref-format-oor-fix (2017-07-14) 1 commit
 - check-ref-format: require a repository for --branch

 Discussion slowly continues...
 cf. <20170717172709.GL93855@aiede.mtv.corp.google.com>
 cf. <20170817102217.3yw7uxnkupdy3lh5@sigill.intra.peff.net>


* rs/sha1-file-micro-optim (2017-07-09) 2 commits
 - SQUASH???
 - sha1_file: add slash once in for_each_file_in_obj_subdir()

 Code cleanup.

 Perhaps drop.
 cf. <f59c8256-716b-9305-2a4f-d4fe49f666ff@web.de>


* jc/allow-lazy-cas (2017-07-06) 1 commit
 - push: disable lazy --force-with-lease by default

 Because "git push --force-with-lease[=<ref>]" that relies on the
 stability of remote-tracking branches is unsafe when something
 fetches into the repository behind user's back, it is now disabled
 by default.  A new configuration variable can be used to enable it
 by users who know what they are doing.  This would pave the way to
 possibly turn `--force` into `--force-with-lease`.

 Will discard.
 Independent from disabling the feature by default, this stirred up
 a discussion to replace the DWIM heuristics with a better one, which
 deserves to be its own topic.
 cf. <alpine.DEB.2.21.1.1707131435220.4193@virtualbox>


* ex/deprecate-empty-pathspec-as-match-all (2017-06-23) 2 commits
  (merged to 'next' on 2017-08-14 at 24db08a6e8)
 + pathspec: die on empty strings as pathspec
 + t0027: do not use an empty string as a pathspec element

 The final step to make an empty string as a pathspec element
 illegal.  We started this by first deprecating and warning a
 pathspec that has such an element in 2.11 (Nov 2016).

 Hopefully we can merge this down to the 'master' by the end of the
 year?  A deprecation warning period that is about 1 year does not
 sound too bad.

 Will cook in 'next'.
 As the draft RelNotes says, let's merge this to 'master' after
 this release cycle.


* sd/branch-copy (2017-06-18) 3 commits
 - branch: add a --copy (-c) option to go with --move (-m)
 - branch: add test for -m renaming multiple config sections
 - config: create a function to format section headers

 "git branch" learned "-c/-C" to create and switch to a new branch
 by copying an existing one.

 I personally do not think "branch --copy master backup" while on
 "master" that switches to "backup" is a good UI, and I *will* say
 "I told you so" when users complain after we merge this down to
 'master'.

--------------------------------------------------
[Discarded]

* jc/apply-with-crlf (2017-08-16) 5 commits
 . apply: clarify read_old_data() is about no-index case
 . apply: localize the CRLF business to read_old_data()
 . apply: only pay attention to CRLF in the preimage
 . apply: remove unused field apply_state.flags
 . apply: file commited with CRLF should roundtrip diff and apply

 This served as an input to updated tb/apply-with-crlf.



* jn/per-repo-obj-store (2017-09-07) 39 commits
 . pack: allow sha1_loose_object_info to handle arbitrary repositories
 . pack: allow map_sha1_file to handle arbitrary repositories
 . pack: allow map_sha1_file_1 to handle arbitrary repositories
 . pack: allow open_sha1_file to handle arbitrary repositories
 . pack: allow stat_sha1_file to handle arbitrary repositories
 . pack: allow sha1_file_name to handle arbitrary repositories
 . pack: allow reprepare_packed_git to handle arbitrary repositories
 . pack: allow prepare_packed_git to handle arbitrary repositories
 . pack: allow prepare_packed_git_one to handle arbitrary repositories
 . pack: allow prepare_packed_git_mru to handle arbitrary repositories
 . pack: allow rearrange_packed_git to handle arbitrary repositories
 . pack: allow install_packed_git to handle arbitrary repositories
 . object-store: allow foreach_alt_odb to handle arbitrary repositories
 . object-store: allow prepare_alt_odb to handle arbitrary repositories
 . sha1_file: allow alt_odb_usable to handle arbitrary repositories
 . pack: add repository argument to map_sha1_file
 . pack: add repository argument to sha1_file_name
 . pack: add repository argument to reprepare_packed_git
 . pack: add repository argument to prepare_packed_git
 . pack: add repository argument to prepare_packed_git_mru
 . pack: add repository argument to rearrange_packed_git
 . pack: add repository argument to prepare_packed_git_one
 . pack: add repository argument to install_packed_git
 . object-store: add repository argument to foreach_alt_odb
 . object-store: add repository argument to prepare_alt_odb
 . sha1_file: add repository argument to sha1_loose_object_info
 . sha1_file: add repository argument to map_sha1_file_1
 . sha1_file: add repository argument to open_sha1_file
 . sha1_file: add repository argument to stat_sha1_file
 . sha1_file: add repository argument to link_alt_odb_entries
 . sha1_file: add repository argument to read_info_alternates
 . sha1_file: add repository argument to link_alt_odb_entry
 . sha1_file: add repository argument to alt_odb_usable
 . pack: move approximate object count to object store
 . pack: move prepare_packed_git_run_once to object store
 . object-store: move packed_git and packed_git_mru to object store
 . object-store: move alt_odb_list and alt_odb_tail to object store
 . repository: introduce object store field
 . pack: make packed_git_mru global a value instead of a pointer

 We now can have separate instances of in-core object store per
 repository we visit.

 Will be rerolled.

Re: What's cooking in git.git (Sep 2017, #03; Fri, 15)

[Lars Schneider]

On 15 Sep 2017, at 07:58, Junio C Hamano <gitster@pobox.com> wrote:

> 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 ones marked with '.' do not appear in any of
> the integration branches, but I am still holding onto them.

> ...

> * ls/travis-scriptify (2017-09-11) 3 commits
>  (merged to 'next' on 2017-09-14 at 8fa685d3b7)
> + travis: dedent a few scripts that are indented overly deeply
> + travis-ci: skip a branch build if equal tag is present
> + travis-ci: move Travis CI code into dedicated scripts
> 
> The scripts to drive TravisCI has been reorganized and then an
> optimization to avoid spending cycles on a branch whose tip is
> tagged has been implemented.
> 
> Will merge to 'master'.

SZEDER noticing a bug in this series that I was about to fix:
https://public-inbox.org/git/3B175D35-5B1C-43CD-A7E9-85693335B10A@gmail.com/

I assume at this point a new patch is better than a re-roll, right?

Thanks,
Lars

Re: What's cooking in git.git (Sep 2017, #03; Fri, 15)

[Johannes Schindelin]

Hi Junio,

On Fri, 15 Sep 2017, Junio C Hamano wrote:

> * js/rebase-i-final (2017-07-27) 10 commits
>  - rebase -i: rearrange fixup/squash lines using the rebase--helper
>  - t3415: test fixup with wrapped oneline
>  - rebase -i: skip unnecessary picks using the rebase--helper
>  - rebase -i: check for missing commits in the rebase--helper
>  - t3404: relax rebase.missingCommitsCheck tests
>  - rebase -i: also expand/collapse the SHA-1s via the rebase--helper
>  - rebase -i: do not invent onelines when expanding/collapsing SHA-1s
>  - rebase -i: remove useless indentation
>  - rebase -i: generate the script via rebase--helper
>  - t3415: verify that an empty instructionFormat is handled as before
> 
>  The final batch to "git rebase -i" updates to move more code from
>  the shell script to C.
> 
>  Expecting a reroll.

Please stop stating that you expect a reroll for rebase-i-extra when you
explicitly stated months ago that you would not take my v6. It gets a bit
annoying.

Thanks,
Dscho

Re: What's cooking in git.git (Sep 2017, #03; Fri, 15)

[Johannes Schindelin]

Hi Junio,

On Fri, 15 Sep 2017, Junio C Hamano wrote:

> --------------------------------------------------
> [Cooking]
> 
> [...]
> 
> * mk/diff-delta-uint-may-be-shorter-than-ulong (2017-08-10) 1 commit
>  . diff-delta: fix encoding size that would not fit in "unsigned int"
> 
>  The machinery to create xdelta used in pack files received the
>  sizes of the data in size_t, but lost the higher bits of them by
>  storing them in "unsigned int" during the computation, which is
>  fixed.
> 
>  Dropped, as it was rerolled for review as part of a larger series.
>  cf. <1502914591-26215-1-git-send-email-martin@mail.zuhause>
> 
> [...]
> 
> * mk/use-size-t-in-zlib (2017-08-10) 1 commit
>  . zlib.c: use size_t for size
> 
>  The wrapper to call into zlib followed our long tradition to use
>  "unsigned long" for sizes of regions in memory, which have been
>  updated to use "size_t".
> 
>  Dropped, as it was rerolled for review as part of a larger series.
>  cf. <1502914591-26215-1-git-send-email-martin@mail.zuhause>
> 
> 
> * mk/diff-delta-avoid-large-offset (2017-08-11) 1 commit
>  . diff-delta: do not allow delta offset truncation
> 
>  The delta format used in the packfile cannot reference data at
>  offset larger than what can be expressed in 4-byte, but the
>  generator for the data failed to make sure the offset does not
>  overflow.  This has been corrected.
> 
>  Dropped, as it was rerolled for review as part of a larger series.
>  cf. <1502914591-26215-1-git-send-email-martin@mail.zuhause>
> 
> 
> --------------------------------------------------
> [Discarded]
> 
> [...]

These three topics are still in the wrong category. Please fix.

Ciao,
Dscho

Re: What's cooking in git.git (Sep 2017, #03; Fri, 15)

[Junio C Hamano]

Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:

> Please stop stating that you expect a reroll for rebase-i-extra when you
> explicitly stated months ago that you would not take my v6. It gets a bit
> annoying.

I already explained to you why I skipped v6, which turned to be
identical to v5 when the unnecessary rebase was undone.  It does not
have anything to do with expecting a v7 or later to fix other things
already pointed out in the review.

Having said that, I am getting sick of your constant hostile
whining, and am inclined to merge it as-is to 'next' and advance it
from there, if only to reduce these noises from you.  Even if you
are unwilling to, you do not have the sole possession and veto power
over the area of the code (neither do I) to prevent further
improvements, so I can expect others with good design taste
(hopefully not me) to fix up the misuse of revision traversal
implementation detail with follow-up patches.

Re: What's cooking in git.git (Sep 2017, #03; Fri, 15)

[Junio C Hamano]

Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:

> Hi Junio,
>
> On Fri, 15 Sep 2017, Junio C Hamano wrote:
>
>> --------------------------------------------------
>> [Cooking]
>> 
>> [...]
>> 
>> * mk/diff-delta-uint-may-be-shorter-than-ulong (2017-08-10) 1 commit
>>  ...
>>  Dropped, as it was rerolled for review as part of a larger series.
>>  cf. <1502914591-26215-1-git-send-email-martin@mail.zuhause>
>> 
>> [...]
>> 
>> * mk/use-size-t-in-zlib (2017-08-10) 1 commit
>>  ...
>>  Dropped, as it was rerolled for review as part of a larger series.
>>  cf. <1502914591-26215-1-git-send-email-martin@mail.zuhause>
>> 
>> 
>> * mk/diff-delta-avoid-large-offset (2017-08-11) 1 commit
>>  ...
>>  Dropped, as it was rerolled for review as part of a larger series.
>>  cf. <1502914591-26215-1-git-send-email-martin@mail.zuhause>
>> 
>> 
>> --------------------------------------------------
>> [Discarded]
>> 
>> [...]
>
> These three topics are still in the wrong category. Please fix.

Hmph, but did the larger series these refer to actually land?  If I
recall correctly they were too invasive to get merged cleanly to
'next' and 'pu' without disrupting topics in flight and that is why
it is not even listed there.

The only two reasons a topic with a good goal and approach gets
thrown into the Discarded bin are either because it is tentatively
retracted to avoid disrupting other topics in flight (with the
expectation to be redone later) or what it wants to solve is
addressed by another topic and becomes unnecessary.

These three attempt to do good things and I have been hoping that
others can help moving them forward by e.g. reporting that they
still cleanly merge and stand on their own as improvements at a
smaller scale than the larger one that was attempted but was not
queued, or if nobody volunteers, I was guessing that I might end up
doing that myself.  Before that happens, I'd prefer to keep them
listed and topics kept in my tree, even if they are not part of
'pu'.

On the other hand, because many topics have graduated to master
recently, the larger one (possibly in the updated form---I do not
recall what conflicts it had with what other topics) may be able to
cook peacefully together with topics we have that are still in
flight.  If that is the case, then that larger topic will be queued
and these three will truly become material for the Discarded bin.

Re: What's cooking in git.git (Sep 2017, #03; Fri, 15)

[Junio C Hamano]

Lars Schneider <larsxschneider@gmail.com> writes:

> SZEDER noticing a bug in this series that I was about to fix:
> https://public-inbox.org/git/3B175D35-5B1C-43CD-A7E9-85693335B10A@gmail.com/
>
> I assume at this point a new patch is better than a re-roll, right?

Thanks, yes indeed.

Re: What's cooking in git.git (Sep 2017, #03; Fri, 15)

[Sahil Dua]

>
> * sd/branch-copy (2017-06-18) 3 commits
>  - branch: add a --copy (-c) option to go with --move (-m)
>  - branch: add test for -m renaming multiple config sections
>  - config: create a function to format section headers
>
>  "git branch" learned "-c/-C" to create and switch to a new branch
>  by copying an existing one.
>
>  I personally do not think "branch --copy master backup" while on
>  "master" that switches to "backup" is a good UI, and I *will* say
>  "I told you so" when users complain after we merge this down to
>  'master'.

Junio, what's up with this one? It's been a long time for this being
cooked in next. Do we have a plan/idea going forward or is it just
waiting for more feedback?

Re: What's cooking in git.git (Sep 2017, #03; Fri, 15)

[Junio C Hamano]

Sahil Dua <sahildua2305@gmail.com> writes:

>>
>> * sd/branch-copy (2017-06-18) 3 commits
>>  - branch: add a --copy (-c) option to go with --move (-m)
>>  - branch: add test for -m renaming multiple config sections
>>  - config: create a function to format section headers
>>
>>  "git branch" learned "-c/-C" to create and switch to a new branch
>>  by copying an existing one.
>>
>>  I personally do not think "branch --copy master backup" while on
>>  "master" that switches to "backup" is a good UI, and I *will* say
>>  "I told you so" when users complain after we merge this down to
>>  'master'.
>
> Junio, what's up with this one? It's been a long time for this being
> cooked in next. Do we have a plan/idea going forward or is it just
> waiting for more feedback?

Thanks for pinging.

I was (in a strange way) hoping that it was just me who felt that a
"copy" operation of the current branch that moves me to a new branch
is a design mistake, and I was planning to start merging this down
to 'next' based on that assumption, but IIRC it turned out that it
wasn't just me.  During the renewed discussion I somehow got an
impression that the concensus was for "copy" to just copy without
ever changing what HEAD says, and if an operation that switches to a
new branch based on the current branch is needed, the right place to
do so is to enhance/extend "checkout -b".

My understanding of the next step was for those who are interested
in moving this topic forward to update these patches in that
direction.

Re: What's cooking in git.git (Sep 2017, #03; Fri, 15)

[Junio C Hamano]

Junio C Hamano <gitster@pobox.com> writes:

> My understanding of the next step was for those who are interested
> in moving this topic forward to update these patches in that
> direction.

Well, I am one of those who are interested in moving this topic
forward, not because I'm likely to use it, but because the fewer
number of topics I have to keep in flight, the easier my work gets.

So here is such an update.  As the topic is not in 'next' yet, it
could also be implemented by replacing patch(es) in the series, but
doing it as a follow-up fix made it easier to see what got changed
(both in the code and in the tests), so that is how I decided to do
this patch.

-- >8 --
Subject: [PATCH] branch: fix "copy" to never touch HEAD

Probably because "git branch -c A B" piggybacked its implementation
on "git branch -m A B", when creating a new branch B by copying the
branch A that happens to be the current branch, it also updated HEAD
to point at the new branch.

This does not match the usual expectation.  If I were sitting on a
blue chair, and somebody comes and repaints it to red, I would
accept ending up sitting on a red chair, but if somebody creates a
new red chair, modelling it after the blue chair I am sitting on, I
do not expect to be booted off of the blue chair and ending up on
sitting on the red one.

Let's fix this strange behaviour before it hits 'next'.  Those who
want to create a new branch and switch to it can do "git checkout B"
after creating it by copying the current branch, or if that is so
useful to deserve a short-hand way to do so, perhaps extend "git
checkout -b B" to copy configurations while creating the new branch
B.  A "copy" should remain to be "copy", not "copy and sometimes
checkout".

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
 builtin/branch.c  |  9 +++------
 t/t3200-branch.sh | 10 +++++-----
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/builtin/branch.c b/builtin/branch.c
index 89f64f4123..e2e3692838 100644
--- a/builtin/branch.c
+++ b/builtin/branch.c
@@ -506,12 +506,9 @@ static void copy_or_rename_branch(const char *oldname, const char *newname, int
 				oldref.buf + 11);
 	}
 
-	if (replace_each_worktree_head_symref(oldref.buf, newref.buf, logmsg.buf)) {
-		if (copy)
-			die(_("Branch copied to %s, but HEAD is not updated!"), newname);
-		else
-			die(_("Branch renamed to %s, but HEAD is not updated!"), newname);
-	}
+	if (!copy &&
+	    replace_each_worktree_head_symref(oldref.buf, newref.buf, logmsg.buf))
+		die(_("Branch renamed to %s, but HEAD is not updated!"), newname);
 
 	strbuf_release(&logmsg);
 
diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh
index 5d03ad16f6..be9b3784c6 100755
--- a/t/t3200-branch.sh
+++ b/t/t3200-branch.sh
@@ -422,7 +422,7 @@ test_expect_success 'git branch --copy is a synonym for -c' '
 	test_cmp expect actual
 '
 
-test_expect_success 'git branch -c ee ef should copy and checkout branch ef' '
+test_expect_success 'git branch -c ee ef should copy to create branch ef' '
 	git checkout -b ee &&
 	git reflog exists refs/heads/ee &&
 	git config branch.ee.dummy Hello &&
@@ -431,7 +431,7 @@ test_expect_success 'git branch -c ee ef should copy and checkout branch ef' '
 	git reflog exists refs/heads/ef &&
 	test $(git config branch.ee.dummy) = Hello &&
 	test $(git config branch.ef.dummy) = Hello &&
-	test $(git rev-parse --abbrev-ref HEAD) = ef
+	test $(git rev-parse --abbrev-ref HEAD) = ee
 '
 
 test_expect_success 'git branch -c f/f g/g should work' '
@@ -494,12 +494,12 @@ test_expect_success 'git branch -C c1 c2 should succeed when c1 is checked out'
 	git checkout -b c1 &&
 	git branch c2 &&
 	git branch -C c1 c2 &&
-	test $(git rev-parse --abbrev-ref HEAD) = c2
+	test $(git rev-parse --abbrev-ref HEAD) = c1
 '
 
-test_expect_success 'git branch -C c1 c2 should add entries to .git/logs/HEAD' '
+test_expect_success 'git branch -C c1 c2 should never touch HEAD' '
 	msg="Branch: copied refs/heads/c1 to refs/heads/c2" &&
-	grep "$msg$" .git/logs/HEAD
+	! grep "$msg$" .git/logs/HEAD
 '
 
 test_expect_success 'git branch -C master should work when master is checked out' '
-- 
2.14.1-907-g5aa63875cf

Re: What's cooking in git.git (Sep 2017, #03; Fri, 15)

[Sahil Dua]

On Fri, Sep 22, 2017 at 5:39 AM, Junio C Hamano <gitster@pobox.com> wrote:
> Junio C Hamano <gitster@pobox.com> writes:
>
>> My understanding of the next step was for those who are interested
>> in moving this topic forward to update these patches in that
>> direction.
>
> Well, I am one of those who are interested in moving this topic
> forward, not because I'm likely to use it, but because the fewer
> number of topics I have to keep in flight, the easier my work gets.
>
> So here is such an update.  As the topic is not in 'next' yet, it
> could also be implemented by replacing patch(es) in the series, but
> doing it as a follow-up fix made it easier to see what got changed
> (both in the code and in the tests), so that is how I decided to do
> this patch.
>
Awesome! Thanks for the patch. It was easier than I'd have expected it
to be. Looks like it fixes the concerns of moving head. Is there
anythign required from my side on this features / series of patches?
> -- >8 --
> Subject: [PATCH] branch: fix "copy" to never touch HEAD
>
> Probably because "git branch -c A B" piggybacked its implementation
> on "git branch -m A B", when creating a new branch B by copying the
> branch A that happens to be the current branch, it also updated HEAD
> to point at the new branch.
>
> This does not match the usual expectation.  If I were sitting on a
> blue chair, and somebody comes and repaints it to red, I would
> accept ending up sitting on a red chair, but if somebody creates a
> new red chair, modelling it after the blue chair I am sitting on, I
> do not expect to be booted off of the blue chair and ending up on
> sitting on the red one.
>
> Let's fix this strange behaviour before it hits 'next'.  Those who
> want to create a new branch and switch to it can do "git checkout B"
> after creating it by copying the current branch, or if that is so
> useful to deserve a short-hand way to do so, perhaps extend "git
> checkout -b B" to copy configurations while creating the new branch
> B.  A "copy" should remain to be "copy", not "copy and sometimes
> checkout".
>
> Signed-off-by: Junio C Hamano <gitster@pobox.com>
> ---
>  builtin/branch.c  |  9 +++------
>  t/t3200-branch.sh | 10 +++++-----
>  2 files changed, 8 insertions(+), 11 deletions(-)
>
> diff --git a/builtin/branch.c b/builtin/branch.c
> index 89f64f4123..e2e3692838 100644
> --- a/builtin/branch.c
> +++ b/builtin/branch.c
> @@ -506,12 +506,9 @@ static void copy_or_rename_branch(const char *oldname, const char *newname, int
>                                 oldref.buf + 11);
>         }
>
> -       if (replace_each_worktree_head_symref(oldref.buf, newref.buf, logmsg.buf)) {
> -               if (copy)
> -                       die(_("Branch copied to %s, but HEAD is not updated!"), newname);
> -               else
> -                       die(_("Branch renamed to %s, but HEAD is not updated!"), newname);
> -       }
> +       if (!copy &&
> +           replace_each_worktree_head_symref(oldref.buf, newref.buf, logmsg.buf))
> +               die(_("Branch renamed to %s, but HEAD is not updated!"), newname);
>
>         strbuf_release(&logmsg);
>
> diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh
> index 5d03ad16f6..be9b3784c6 100755
> --- a/t/t3200-branch.sh
> +++ b/t/t3200-branch.sh
> @@ -422,7 +422,7 @@ test_expect_success 'git branch --copy is a synonym for -c' '
>         test_cmp expect actual
>  '
>
> -test_expect_success 'git branch -c ee ef should copy and checkout branch ef' '
> +test_expect_success 'git branch -c ee ef should copy to create branch ef' '
>         git checkout -b ee &&
>         git reflog exists refs/heads/ee &&
>         git config branch.ee.dummy Hello &&
> @@ -431,7 +431,7 @@ test_expect_success 'git branch -c ee ef should copy and checkout branch ef' '
>         git reflog exists refs/heads/ef &&
>         test $(git config branch.ee.dummy) = Hello &&
>         test $(git config branch.ef.dummy) = Hello &&
> -       test $(git rev-parse --abbrev-ref HEAD) = ef
> +       test $(git rev-parse --abbrev-ref HEAD) = ee
>  '
>
>  test_expect_success 'git branch -c f/f g/g should work' '
> @@ -494,12 +494,12 @@ test_expect_success 'git branch -C c1 c2 should succeed when c1 is checked out'
>         git checkout -b c1 &&
>         git branch c2 &&
>         git branch -C c1 c2 &&
> -       test $(git rev-parse --abbrev-ref HEAD) = c2
> +       test $(git rev-parse --abbrev-ref HEAD) = c1
>  '
>
> -test_expect_success 'git branch -C c1 c2 should add entries to .git/logs/HEAD' '
> +test_expect_success 'git branch -C c1 c2 should never touch HEAD' '
>         msg="Branch: copied refs/heads/c1 to refs/heads/c2" &&
> -       grep "$msg$" .git/logs/HEAD
> +       ! grep "$msg$" .git/logs/HEAD
>  '
>
>  test_expect_success 'git branch -C master should work when master is checked out' '
> --
> 2.14.1-907-g5aa63875cf
>
>
>



-- 
Regards
Sahil Dua
Software Developer
Booking.com
Connect on LinkedIn
www.sahildua.com

Re: What's cooking in git.git (Sep 2017, #03; Fri, 15)

[Junio C Hamano]

Sahil Dua <sahildua2305@gmail.com> writes:

> On Fri, Sep 22, 2017 at 5:39 AM, Junio C Hamano <gitster@pobox.com> wrote:
>>
>> So here is such an update.  As the topic is not in 'next' yet, it
>> could also be implemented by replacing patch(es) in the series, but
>> doing it as a follow-up fix made it easier to see what got changed
>> (both in the code and in the tests), so that is how I decided to do
>> this patch.
>>
> Awesome! Thanks for the patch. It was easier than I'd have expected it
> to be. Looks like it fixes the concerns of moving head. Is there
> anythign required from my side on this features / series of patches?

If you now agree with the updated behaviour and think it makes more
sense that "git branch -c new HEAD" does not check out 'new', then
there is nothing required.  Well, other than the usual finding,
reporting and optionally fixing bugs in the documentation and the
code, that is ;-)

Thanks.

Re: What's cooking in git.git (Sep 2017, #03; Fri, 15)

[Johannes Schindelin]

Hi Junio,

On Sat, 16 Sep 2017, Junio C Hamano wrote:

> Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
> 
> > On Fri, 15 Sep 2017, Junio C Hamano wrote:
> >
> >> --------------------------------------------------
> >> [Cooking]
> >> 
> >> [...]
> >> 
> >> * mk/diff-delta-uint-may-be-shorter-than-ulong (2017-08-10) 1 commit
> >>  ...
> >>  Dropped, as it was rerolled for review as part of a larger series.
> >>  cf. <1502914591-26215-1-git-send-email-martin@mail.zuhause>
> >> 
> >> [...]
> >> 
> >> * mk/use-size-t-in-zlib (2017-08-10) 1 commit
> >>  ...
> >>  Dropped, as it was rerolled for review as part of a larger series.
> >>  cf. <1502914591-26215-1-git-send-email-martin@mail.zuhause>
> >> 
> >> 
> >> * mk/diff-delta-avoid-large-offset (2017-08-11) 1 commit
> >>  ...
> >>  Dropped, as it was rerolled for review as part of a larger series.
> >>  cf. <1502914591-26215-1-git-send-email-martin@mail.zuhause>
> >> 
> >> 
> >> --------------------------------------------------
> >> [Discarded]
> >> 
> >> [...]
> >
> > These three topics are still in the wrong category. Please fix.
> 
> Hmph, but did the larger series these refer to actually land?

As I have to read these long mails to keep track of the current status of
some submissions, I do not care. However, in the context of this mail, it
does not make sense to have discarded patch series in the cooking section.
It's simply confusing.

Ciao,
Dscho