What's cooking in git.git (Aug 2014, #02; Fri, 8)

What's cooking in git.git (Aug 2014, #02; Fri, 8)

[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 second release candidate snapshot is out.  Hopefully after a
week of a calm pre-release "bugfix-only" period, we can do the 2.1
final late next week.

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

--------------------------------------------------
[Graduated to "master"]

* ta/doc-config (2014-07-30) 1 commit
  (merged to 'next' on 2014-07-31 at ec577fa)
 + add documentation for writing config files


* tf/maint-doc-push (2014-07-31) 1 commit
  (merged to 'next' on 2014-07-31 at 6a8ef70)
 + git-push: fix link in man page

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

* tf/imap-send-create (2014-08-01) 3 commits
 - SQUASH??? varargs form of issue-imap-cmd is no longer used
 - imap-send: create target mailbox if it is missing
 - imap-send: clarify CRAM-MD5 vs LOGIN documentation

 Will merge to 'next' after dealing with the SQUASH??? fix-up.


* bc/archive-pax-header-mode (2014-08-04) 1 commit
 - archive: honor tar.umask even for pax headers

 Implementations of "tar" that do not understand an extended pax
 header would extract the contents of it in a regular file; make
 sure the permission bits of this file follows the same tar.umask
 configuration setting.

 Will merge to 'next'.


* bc/imap-send-doc (2014-08-05) 1 commit
 - imap-send doc: omit confusing "to use imap-send" modifier

 Will merge to 'next'.


* jc/apply-ws-prefix (2014-08-07) 3 commits
 - apply: omit ws check for excluded paths
 - apply: hoist use_patch() helper for path exclusion up
 - apply: use the right attribute for paths in non-Git patches

 Applying a patch not generated by Git in a subdirectory used to
 check the whitespace breakage using the attributes for incorrect
 paths. Also whitespace checks were performed even for paths
 excluded via "git apply --exclude=<path>" mechanism.

 Will merge to 'next'.


* jk/command-line-config-empty-string (2014-08-05) 1 commit
 - config: teach "git -c" to recognize an empty string

 "git -c section.var command" and "git -c section.var= command"
 should pass the configuration differently (the former should be
 a boolean true, the latter should be an empty string).

 Will merge to 'next'.


* jk/pack-bitmap (2014-08-04) 1 commit
 - pack-bitmap: do not use gcc packed attribute

 Will merge to 'next'.


* jk/pretty-empty-format (2014-07-30) 3 commits
 - pretty: make empty userformats truly empty
 - pretty: treat "--format=" as an empty userformat
 - revision: drop useless string offset when parsing "--pretty"

 "git log --pretty/format=" with an empty format string did not mean
 the more obvious "No output whatsoever" but "Use default format",
 which was counterintuitive.

 Will merge to 'next'.


* la/init-doc (2014-08-08) 7 commits
 - Documentation: git-init: flesh out example
 - Documentation: git-init: template directory: reword and cross-reference
 - Documentation: git-init: reword parenthetical statements
 - Documentation: git-init: --separate-git-dir: clarify
 - Documentation: git-init: template directory: reword
 - Documentation: git-init: list items facelift
 - Documentation: git-init: typographical fixes

 Will merge to 'next'.


* lf/bundle-exclusion (2014-08-07) 1 commit
 - bundle: fix exclusion of annotated tags

 Will merge to 'next'.


* mm/log-branch-desc-plug-leak (2014-08-07) 1 commit
 - builtin/log.c: fix minor memory leak

 Will merge to 'next'.


* ta/config-set-1 (2014-08-07) 8 commits
 - add tests for `git_config_get_string_const()`
 - add a test for semantic errors in config files
 - rewrite git_config() to use the config-set API
 - config: add `git_die_config()` to the config-set API
 - change `git_config()` return value to void
 - add line number and file name info to `config_set`
 - config.c: fix accuracy of line number in errors
 - config.c: mark error and warnings strings for translation
 (this branch is used by ta/config-set-2; uses ta/config-set.)


* ta/config-set-2 (2014-08-07) 11 commits
 - branch.c: replace `git_config()` with `git_config_get_string()
 - alias.c: replace `git_config()` with `git_config_get_string()`
 - imap-send.c: replace `git_config()` with `git_config_get_*()` family
 - pager.c: replace `git_config()` with `git_config_get_value()`
 - builtin/gc.c: replace `git_config()` with `git_config_get_*()` family
 - rerere.c: replace `git_config()` with `git_config_get_*()` family
 - fetchpack.c: replace `git_config()` with `git_config_get_*()` family
 - archive.c: replace `git_config()` with `git_config_get_bool()` family
 - read-cache.c: replace `git_config()` with `git_config_get_*()` family
 - http-backend.c: replace `git_config()` with `git_config_get_bool()` family
 - daemon.c: replace `git_config()` with `git_config_get_bool()` family
 (this branch uses ta/config-set and ta/config-set-1.)


* ta/pretty-parse-config (2014-08-04) 1 commit
 - pretty.c: make git_pretty_formats_config return -1 on git_config_string failure

 Will merge to 'next'.

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

* jk/tag-contains (2014-06-30) 8 commits
 . perf: add tests for tag --contains
 . tag: use commit_contains
 . commit: provide a fast multi-tip contains function
 . string-list: add pos to iterator callback
 . add functions for memory-efficient bitmaps
 . paint_down_to_common: use prio_queue
 . tag: factor out decision to stream tags
 . tag: allow --sort with -n

 Expecting a reroll.


* ab/add-interactive-show-diff-func-name (2014-05-12) 2 commits
 - SQUASH??? git-add--interactive: Preserve diff heading when splitting hunks
 - git-add--interactive: Preserve diff heading when splitting hunks

 Waiting for a reroll.


* jn/gitweb-utf8-in-links (2014-05-27) 1 commit
 - gitweb: Harden UTF-8 handling in generated links

 $gmane/250758?


* rh/prompt-tests (2014-06-05) 11 commits
 - t9904: new __git_ps1 tests for Zsh
 - test-lib: make it possible to override how test code is eval'd
 - lib-prompt-tests.sh: add variable for string that encodes percent in PS1
 - lib-prompt-tests.sh: put all tests inside a function
 - t9903: move prompt tests to a new lib-prompt-tests.sh file
 - t9903: move PS1 color code variable definitions to lib-bash.sh
 - t9903: include "Bash" in test names via new $shellname var
 - t9903: run pc mode tests again with PS1 expansion disabled
 - t9903: move test name prefix to a separate variable
 - t9903: put the Bash pc mode prompt test cases in a function
 - t9903: remove Zsh test from the suite of Bash prompt tests

 Expecting a reroll to limit the damage to test_eval_; also reported
 to be broken with older zsh that are still in the field ($gmane/251231).


* ss/userdiff-update-csharp-java (2014-06-02) 2 commits
 - userdiff: support Java try keyword
 - userdiff: support C# async methods and correct C# keywords

 Reviews sent; waiting for a response.


* cc/interpret-trailers (2014-05-28) 11 commits
 - Documentation: add documentation for 'git interpret-trailers'
 - trailer: add tests for commands in config file
 - trailer: execute command from 'trailer.<name>.command'
 - trailer: add tests for "git interpret-trailers"
 - trailer: add interpret-trailers command
 - trailer: put all the processing together and print
 - trailer: parse trailers from file or stdin
 - trailer: process command line trailer arguments
 - trailer: read and process config information
 - trailer: process trailers from input message and arguments
 - trailer: add data structures and basic functions

 A new filter to programatically edit the tail end of the commit log
 messages.

 What is the status of this one?  I think I saw reviews by Michael
 but after that I do not recall seeing any updates.


* mh/lockfile (2014-04-15) 25 commits
 . trim_last_path_elm(): replace last_path_elm()
 . resolve_symlink(): take a strbuf parameter
 . resolve_symlink(): use a strbuf for internal scratch space
 . change lock_file::filename into a strbuf
 . commit_lock_file(): use a strbuf to manage temporary space
 . try_merge_strategy(): use a statically-allocated lock_file object
 . try_merge_strategy(): remove redundant lock_file allocation
 . struct lock_file: declare some fields volatile
 . lockfile: avoid transitory invalid states
 . commit_lock_file(): die() if called for unlocked lockfile object
 . commit_lock_file(): inline temporary variable
 . remove_lock_file(): call rollback_lock_file()
 . lock_file(): exit early if lockfile cannot be opened
 . write_packed_entry_fn(): convert cb_data into a (const int *)
 . prepare_index(): declare return value to be (const char *)
 . delete_ref_loose(): don't muck around in the lock_file's filename
 . cache.h: define constants LOCK_SUFFIX and LOCK_SUFFIX_LEN
 . lockfile.c: document the various states of lock_file objects
 . lock_file(): always add lock_file object to lock_file_list
 . hold_lock_file_for_append(): release lock on errors
 . lockfile: unlock file if lockfile permissions cannot be adjusted
 . rollback_lock_file(): set fd to -1
 . rollback_lock_file(): do not clear filename redundantly
 . api-lockfile: expand the documentation
 . unable_to_lock_die(): rename function from unable_to_lock_index_die()

 Ejected from 'pu' to unclutter.
 Expecting a reroll.


* bg/rebase-off-of-previous-branch (2014-04-16) 1 commit
 - git-rebase: print name of rev when using shorthand

 Teach "git rebase -" to report the concrete name of the branch
 (i.e. the previous one).

 But it stops short and does not do the same for "git rebase @{-1}".
 Expecting a reroll.


* tr/merge-recursive-index-only (2014-02-05) 3 commits
 - merge-recursive: -Xindex-only to leave worktree unchanged
 - merge-recursive: internal flag to avoid touching the worktree
 - merge-recursive: remove dead conditional in update_stages()
 (this branch is used by tr/remerge-diff.)


* tr/remerge-diff (2014-02-26) 5 commits
 . log --remerge-diff: show what the conflict resolution changed
 . name-hash: allow dir hashing even when !ignore_case
 . merge-recursive: allow storing conflict hunks in index
 . revision: fold all merge diff variants into an enum merge_diff_mode
 . combine-diff: do not pass revs->dense_combined_merges redundantly
 (this branch uses tr/merge-recursive-index-only.)

 "log -p" output learns a new way to let users inspect a merge
 commit by showing the differences between the automerged result
 with conflicts the person who recorded the merge would have seen
 and the final conflict resolution that was recorded in the merge.

 Needs to be rebased, now kb/fast-hashmap topic is in.


* jk/makefile (2014-02-05) 16 commits
 . FIXUP
 . move LESS/LV pager environment to Makefile
 . Makefile: teach scripts to include make variables
 . FIXUP
 . Makefile: auto-build C strings from make variables
 . Makefile: drop *_SQ variables
 . FIXUP
 . Makefile: add c-quote helper function
 . Makefile: introduce sq function for shell-quoting
 . Makefile: always create files via make-var
 . Makefile: store GIT-* sentinel files in MAKE/
 . Makefile: prefer printf to echo for GIT-*
 . Makefile: use tempfile/mv strategy for GIT-*
 . Makefile: introduce make-var helper function
 . Makefile: fix git-instaweb dependency on gitweb
 . Makefile: drop USE_GETTEXT_SCHEME from GIT-CFLAGS

 Simplify the Makefile rules and macros that exist primarily for
 quoting purposes, and make it easier to robustly express the
 dependency rules.

 Expecting a reroll.


* po/everyday-doc (2014-01-27) 1 commit
 - Make 'git help everyday' work

 This may make the said command to emit something, but the source is
 not meant to be formatted into a manual pages to begin with, and
 also its contents are a bit stale.  It may be a good first step in
 the right direction, but needs more work to at least get the
 mark-up right before public consumption.

 Will hold.


* rb/merge-prepare-commit-msg-hook (2014-01-10) 4 commits
 - merge: drop unused arg from abort_commit method signature
 - merge: make prepare_to_commit responsible for write_merge_state
 - t7505: ensure cleanup after hook blocks merge
 - t7505: add missing &&

 Expose more merge states (e.g. $GIT_DIR/MERGE_MODE) to hooks that
 run during "git merge".  The log message stresses too much on one
 hook, prepare-commit-msg, but it would equally apply to other hooks
 like post-merge, I think.

 Waiting for a reroll.


* jc/graph-post-root-gap (2013-12-30) 3 commits
 - WIP: document what we want at the end
 - graph: remove unused code a bit
 - graph: stuff the current commit into graph->columns[]

 This was primarily a RFH ($gmane/239580).


* tg/perf-lib-test-perf-cleanup (2013-09-19) 2 commits
 - perf-lib: add test_perf_cleanup target
 - perf-lib: split starting the test from the execution

 Add test_perf_cleanup shell function to the perf suite, that allows
 the script writers to define a test with a clean-up action.

 Will hold.


* jc/show-branch (2014-03-24) 5 commits
 - show-branch: use commit slab to represent bitflags of arbitrary width
 - show-branch.c: remove "all_mask"
 - show-branch.c: abstract out "flags" operation
 - show-branch.c: lift all_mask/all_revs to a global static
 - show-branch.c: update comment style

 Waiting for the final step to lift the hard-limit before sending it out.

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

* jk/stash-list-p (2014-08-07) 1 commit
 - stash: default listing to working-tree diff

 Teach "git stash list -p" to show the difference between the base
 commit version and the working tree version, which is in line with
 what "git show" gives.

 Will merge to 'next'.


* pr/remotes-in-hashmap (2014-07-30) 1 commit
 - use a hashmap to make remotes faster

 Optimize remotes configuration look-up in a repository with very
 many remotes defined.

 Will merge to 'next'.


* rs/ref-transaction-multi (2014-07-31) 5 commits
 - refs.c: make the *_packed_refs functions static
 - refs.c: make repack_without_refs static
 - remote.c: use a transaction for deleting refs
 - refs.c: write updates to packed refs when a transaction has more than one ref
 - refs.c: move reflog updates into its own function
 (this branch uses rs/ref-transaction, rs/ref-transaction-1, rs/ref-transaction-reflog and rs/ref-transaction-rename.)

 Follow-up on rs/ref-transaction series to use the packed-ref to
 achieve atomicity when multiple refs are involved.

 No more nitpicks and better design suggestions?


* rs/ref-transaction-rename (2014-07-31) 5 commits
 - refs.c: rollback the lockfile before we die() in repack_without_refs
 - refs.c: update rename_ref to use a transaction
 - refs.c: use packed refs when deleting refs during a transaction
 - refs.c: return error instead of dying when locking fails during transaction
 - refs.c: allow passing raw git_committer_info as email to _update_reflog
 (this branch is used by rs/ref-transaction-multi; uses rs/ref-transaction, rs/ref-transaction-1 and rs/ref-transaction-reflog.)

 Follow-up on rs/ref-transaction series to make renaming a ref
 transactional (i.e. "delete old and create new" should not leave
 an in-between state behind when it fails).

 No more nitpicks and better design suggestions?


* nd/lock-paths-absolute (2014-08-01) 3 commits
 - lockfile.c: store absolute path
 - lockfile.c: remove PATH_MAX limit in resolve_symlink()
 - lockfile.c: remove PATH_MAX limitation (except in resolve_symlink)
 (this branch uses rs/strbuf-getcwd.)

 Will merge to 'next'.


* mm/config-message-i18n (2014-08-01) 1 commit
 - config.c: mark error and warnings strings for translation

 Will discard (now at the bottom of ta/config-set-1 topic).


* mm/config-edit-global (2014-07-25) 3 commits
  (merged to 'next' on 2014-07-31 at ecce1c7)
 + commit: advertise config --global --edit on guessed identity
 + home_config_paths(): let the caller ignore xdg path
 + config --global --edit: create a template file if needed

 Start "git config --edit --global" from a skeletal per-user
 configuration file contents, instead of a total blank, when the
 user does not already have any.  This immediately reduces the need
 for a later "Have you forgotten setting core.user?" and we can add
 more to the template as we gain more experience.

 Will cook in 'next'.


* rs/init-no-duplicate-real-path (2014-07-28) 1 commit
  (merged to 'next' on 2014-07-31 at 683112e)
 + init: avoid superfluous real_path() calls

 Will cook in 'next'.


* rs/ref-transaction-reflog (2014-07-23) 15 commits
 - refs.c: allow deleting refs with a broken sha1
 - refs.c: remove lock_any_ref_for_update
 - refs.c: make unlock_ref/close_ref/commit_ref static
 - refs.c: rename log_ref_setup to create_reflog
 - reflog.c: use a reflog transaction when writing during expire
 - refs.c: allow multiple reflog updates during a single transaction
 - refs.c: only write reflog update if msg is non-NULL
 - refs.c: add a flag to allow reflog updates to truncate the log
 - refs.c: add a transaction function to append a reflog entry
 - lockfile.c: make hold_lock_file_for_append preserve meaningful errno
 - refs.c: add a function to append a reflog entry to a fd
 - refs.c: add a new update_type field to ref_update
 - refs.c: rename the transaction functions
 - refs.c: make ref_transaction_delete a wrapper for ref_transaction_update
 - refs.c: make ref_transaction_create a wrapper to ref_transaction_update
 (this branch is used by rs/ref-transaction-multi and rs/ref-transaction-rename; uses rs/ref-transaction and rs/ref-transaction-1.)

 Cover updates to reflog with the same transaction mechanism as used
 for reflog manipulations.

 No more nitpicks and better design suggestions?


* cb/mergetool-difftool (2014-07-21) 2 commits
 - difftool: don't assume that default sh is sane
 - mergetool: don't require a work tree for --tool-help

 Update the way the "difftool --help" shows the help message that is
 shared with the "mergetool" to reduce one shell dependency.

 Will merge to 'next'.


* rs/strbuf-getcwd (2014-07-29) 10 commits
  (merged to 'next' on 2014-07-31 at 6edc3bc)
 + use strbuf_add_absolute_path() to add absolute paths
 + abspath: convert absolute_path() to strbuf
 + use xgetcwd() to set $GIT_DIR
 + use xgetcwd() to get the current directory or die
 + wrapper: add xgetcwd()
 + abspath: convert real_path_internal() to strbuf
 + abspath: use strbuf_getcwd() to remember original working directory
 + setup: convert setup_git_directory_gently_1 et al. to strbuf
 + unix-sockets: use strbuf_getcwd()
 + strbuf: add strbuf_getcwd()
 (this branch is used by nd/lock-paths-absolute.)

 Will cook in 'next'.


* jc/not-mingw-cygwin (2014-07-21) 2 commits
 - test prerequisites: enumerate with commas
 - test prerequisites: eradicate NOT_FOO

 We have been using NOT_{MINGW,CYGWIN} test prerequisites long
 before Peff invented support for negated prerequisites e.g. !MINGW
 and we still add more uses of the former.  Convert them to the
 latter to avoid confusion.


* ta/config-set (2014-07-29) 2 commits
 - test-config: add tests for the config_set API
 - add `config_set` API for caching config-like files
 (this branch is used by ta/config-set-1 and ta/config-set-2.)

 Add in-core caching layer to let us avoid reading the same
 configuration files number of times.

 Will merge to 'next'.


* rs/ref-transaction-1 (2014-07-16) 20 commits
 - refs.c: make delete_ref use a transaction
 - refs.c: make prune_ref use a transaction to delete the ref
 - refs.c: remove lock_ref_sha1
 - refs.c: remove the update_ref_write function
 - refs.c: remove the update_ref_lock function
 - refs.c: make lock_ref_sha1 static
 - walker.c: use ref transaction for ref updates
 - fast-import.c: use a ref transaction when dumping tags
 - receive-pack.c: use a reference transaction for updating the refs
 - refs.c: change update_ref to use a transaction
 - branch.c: use ref transaction for all ref updates
 - fast-import.c: change update_branch to use ref transactions
 - sequencer.c: use ref transactions for all ref updates
 - commit.c: use ref transactions for updates
 - replace.c: use the ref transaction functions for updates
 - tag.c: use ref transactions when doing updates
 - refs.c: add transaction.status and track OPEN/CLOSED/ERROR
 - refs.c: make ref_transaction_begin take an err argument
 - refs.c: update ref_transaction_delete to check for error and return status
 - refs.c: change ref_transaction_create to do error checking and return status
 (this branch is used by rs/ref-transaction, rs/ref-transaction-multi, rs/ref-transaction-reflog and rs/ref-transaction-rename.)

 The second batch of the transactional ref update series.

 No more nitpicks and better design suggestions?


* jc/reopen-lock-file (2014-07-14) 1 commit
  (merged to 'next' on 2014-07-21 at 8277dc9)
 + lockfile: allow reopening a closed but still locked file

 Needed in the "commit -p" code path to update the cache tree in the
 index (e.g. for dt/cache-tree-repair topic).

 Will cook in 'next'.


* nd/multiple-work-trees (2014-07-17) 31 commits
  (merged to 'next' on 2014-07-17 at a29d310)
 + checkout: don't require a work tree when checking out into a new one
 + git_path(): keep "info/sparse-checkout" per work-tree
 + count-objects: report unused files in $GIT_DIR/repos/...
 + gc: support prune --repos
 + gc: factor out gc.pruneexpire parsing code
 + gc: style change -- no SP before closing parenthesis
 + prune: strategies for linked checkouts
 + checkout: detach if the branch is already checked out elsewhere
 + checkout: clean up half-prepared directories in --to mode
 + checkout: support checking out into a new working directory
 + use new wrapper write_file() for simple file writing
 + wrapper.c: wrapper to open a file, fprintf then close
 + setup.c: support multi-checkout repo setup
 + setup.c: detect $GIT_COMMON_DIR check_repository_format_gently()
 + setup.c: convert check_repository_format_gently to use strbuf
 + setup.c: detect $GIT_COMMON_DIR in is_git_directory()
 + setup.c: convert is_git_directory() to use strbuf
 + git-stash: avoid hardcoding $GIT_DIR/logs/....
 + *.sh: avoid hardcoding $GIT_DIR/hooks/...
 + git-sh-setup.sh: use rev-parse --git-path to get $GIT_DIR/objects
 + $GIT_COMMON_DIR: a new environment variable
 + commit: use SEQ_DIR instead of hardcoding "sequencer"
 + fast-import: use git_path() for accessing .git dir instead of get_git_dir()
 + reflog: avoid constructing .lock path with git_path
 + *.sh: respect $GIT_INDEX_FILE
 + git_path(): be aware of file relocation in $GIT_DIR
 + path.c: group git_path(), git_pathdup() and strbuf_git_path() together
 + path.c: rename vsnpath() to do_git_path()
 + git_snpath(): retire and replace with strbuf_git_path()
 + path.c: make get_pathname() call sites return const char *
 + path.c: make get_pathname() return strbuf instead of static buffer
 (this branch is used by nd/multiple-work-trees-1.)

 A replacement for contrib/workdir/git-new-workdir that does not
 rely on symbolic links and make sharing of objects and refs safer
 by making the borrowee and borrowers aware of each other.

 Will cook in 'next'.


* nd/multiple-work-trees-1 (2014-07-29) 8 commits
 - checkout --to: do not touch existing target directory
 - checkout: prefix --to argument properly when cwd is moved
 - environment.c: fix incorrect git_graft_file initialization
 - checkout --to: fix dangling pointers in remove_junk()
 - checkout: no auto-detach if the ref is already checked out
 - prune --repos: fix uninitialized access
 - checkout: no need to call check_linked_checkouts if head_ref is NULL
 - gitrepository-layout.txt: s/ignored/ignored if/
 (this branch uses nd/multiple-work-trees.)

 Continue polishing nd/multiple-work-trees topic in 'next'.

 Will merge to 'next'.


* dt/cache-tree-repair (2014-07-14) 4 commits
  (merged to 'next' on 2014-07-21 at e83db34)
 + cache-tree: Write updated cache-tree after commit
 + cache-tree: subdirectory tests
 + test-dump-cache-tree: invalid trees are not errors
 + cache-tree: create/update cache-tree on checkout

 Add a few more places in "commit" and "checkout" that make sure
 that the cache-tree is fully populated in the index.

 Will cook in 'next'.


* hv/submodule-config (2014-06-30) 4 commits
  (merged to 'next' on 2014-07-17 at 5e0ce45)
 + do not die on error of parsing fetchrecursesubmodules option
 + use new config API for worktree configurations of submodules
 + extract functions for submodule config set and lookup
 + implement submodule config cache for lookup of submodule names

 Will cook in 'next'.


* rs/ref-transaction (2014-07-17) 12 commits
 - refs.c: fix handling of badly named refs
 - refs.c: make write_ref_sha1 static
 - fetch.c: change s_update_ref to use a ref transaction
 - refs.c: propagate any errno==ENOTDIR from _commit back to the callers
 - refs.c: pass a skip list to name_conflict_fn
 - refs.c: call lock_ref_sha1_basic directly from commit
 - refs.c: move the check for valid refname to lock_ref_sha1_basic
 - refs.c: pass NULL as *flags to read_ref_full
 - refs.c: pass the ref log message to _create/delete/update instead of _commit
 - refs.c: add an err argument to delete_ref_loose
 - wrapper.c: add a new function unlink_or_msg
 - wrapper.c: simplify warn_if_unremovable
 (this branch is used by rs/ref-transaction-multi, rs/ref-transaction-reflog and rs/ref-transaction-rename; uses rs/ref-transaction-1.)


* jc/test-lazy-prereq (2014-06-13) 1 commit
 - tests: drop GIT_*_TIMING_TESTS environment variable support

 Test-script clean-up.

 Will hold.


* mt/patch-id-stable (2014-06-10) 1 commit
 - patch-id: change default to stable

 Teaches "git patch-id" to compute the patch ID that does not change
 when the files in a single patch is reordered. As this new algorithm
 is backward incompatible, the last bit to flip it to be the default
 is left out of 'master' for now.

 Will hold.

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

* jh/submodule-tests (2014-04-17) 1 commit
 . t7410: 210 tests for various 'git submodule update' scenarios


* nd/path-max-is-better-than-hardcoded-magic-1024 (2014-07-17) 1 commit
 . abspath.c: use PATH_MAX in real_path_internal()

 rs/strbuf-getcwd topic covers this codepath in a better way.

Re: What's cooking in git.git (Aug 2014, #02; Fri, 8)

[Duy Nguyen]

On Sat, Aug 9, 2014 at 5:18 AM, Junio C Hamano <gitster@pobox.com> wrote:
> * nd/lock-paths-absolute (2014-08-01) 3 commits
>  - lockfile.c: store absolute path
>  - lockfile.c: remove PATH_MAX limit in resolve_symlink()
>  - lockfile.c: remove PATH_MAX limitation (except in resolve_symlink)
>  (this branch uses rs/strbuf-getcwd.)
>
>  Will merge to 'next'.

You may want to hold this back for a while until Michael has a chance
to look and decides what to do with it and his mh/lockfile series.
-- 
Duy

Re: What's cooking in git.git (Aug 2014, #02; Fri, 8)

[Charles Bailey]

On Fri, Aug 08, 2014 at 03:18:11PM -0700, Junio C Hamano wrote:
> * cb/mergetool-difftool (2014-07-21) 2 commits
>  - difftool: don't assume that default sh is sane
>  - mergetool: don't require a work tree for --tool-help
> 
>  Update the way the "difftool --help" shows the help message that is
>  shared with the "mergetool" to reduce one shell dependency.
> 
>  Will merge to 'next'.

Can you hold off on merging this? I think I want to have another go at
making this neater.

Specifically, --tool-help doesn't need a working tree but I hadn't
spotted that it still requires a GIT_DIR / --git-dir when it really
shouldn't.

Re: What's cooking in git.git (Aug 2014, #02; Fri, 8)

[Jeff King]

On Fri, Aug 08, 2014 at 03:18:11PM -0700, Junio C Hamano wrote:

> * jk/pack-bitmap (2014-08-04) 1 commit
>  - pack-bitmap: do not use gcc packed attribute
> 
>  Will merge to 'next'.

You may want to hold off on merging this; I hope Karsten will re-roll
his neater replacement patch next week, which would replace it
completely.

-Peff

[PATCH v4 0/1] Use absolute paths of lockfiles

[Michael Haggerty]

This patch applies on top of the patch series that I just sent [1]:

    Lockfile correctness and refactoring, v4

It has the same effect as Duy's [2]

    Keep .lock file paths absolute, v3

except that my patch series obviates the need for his patches 1/3 and
2/3. So only one patch remains, the equivalent of his patch 3/3,
simplified because lockfile::filename is now a strbuf.

So I've shamelessly labeled this "v4" of his patch series and I've
left Duy as the author, because his commit message (which I used
directly) has far more intellectual content than the code change. Duy,
if that's not OK with you, please let me know.

Michael

[1] http://thread.gmane.org/gmane.comp.version-control.git/256564
[2] http://thread.gmane.org/gmane.comp.version-control.git/253817/focus=254573

Nguyễn Thái Ngọc Duy (1):
  lockfile.c: store absolute path

 lockfile.c                    | 14 +++++++++++---
 t/t2107-update-index-basic.sh | 15 +++++++++++++++
 2 files changed, 26 insertions(+), 3 deletions(-)

-- 
2.1.0

[PATCH v4 1/1] lockfile.c: store absolute path

[Michael Haggerty]

From: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>

Locked paths can be saved in a linked list so that if something wrong
happens, *.lock are removed. For relative paths, this works fine if we
keep cwd the same, which is true 99% of time except:

- update-index and read-tree hold the lock on $GIT_DIR/index really
  early, then later on may call setup_work_tree() to move cwd.

- Suppose a lock is being held (e.g. by "git add") then somewhere
  down the line, somebody calls real_path (e.g. "link_alt_odb_entry"),
  which temporarily moves cwd away and back.

During that time when cwd is moved (either permanently or temporarily)
and we decide to die(), attempts to remove relative *.lock will fail,
and the next operation will complain that some files are still locked.

Avoid this case by turning relative paths to absolute before storing
the path in "filename" field.

Reported-by: Yue Lin Ho <yuelinho777@gmail.com>
Helped-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
Helped-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Adapted-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
---
 lockfile.c                    | 14 +++++++++++---
 t/t2107-update-index-basic.sh | 15 +++++++++++++++
 2 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/lockfile.c b/lockfile.c
index e54d260..31b63bb 100644
--- a/lockfile.c
+++ b/lockfile.c
@@ -172,9 +172,17 @@ static int lock_file(struct lock_file *lk, const char *path, int flags)
 		lock_file_list = lk;
 	}
 
-	strbuf_addstr(&lk->filename, path);
-	if (!(flags & LOCK_NODEREF))
-		resolve_symlink(&lk->filename);
+	if (flags & LOCK_NODEREF) {
+		strbuf_add_absolute_path(&lk->filename, path);
+	} else {
+		struct strbuf resolved_path = STRBUF_INIT;
+
+		strbuf_addstr(&resolved_path, path);
+		resolve_symlink(&resolved_path);
+		strbuf_add_absolute_path(&lk->filename, resolved_path.buf);
+		strbuf_release(&resolved_path);
+	}
+
 	strbuf_addstr(&lk->filename, LOCK_SUFFIX);
 	lk->fd = open(lk->filename.buf, O_RDWR | O_CREAT | O_EXCL, 0666);
 	if (lk->fd < 0) {
diff --git a/t/t2107-update-index-basic.sh b/t/t2107-update-index-basic.sh
index 1bafb90..dfe02f4 100755
--- a/t/t2107-update-index-basic.sh
+++ b/t/t2107-update-index-basic.sh
@@ -65,4 +65,19 @@ test_expect_success '--cacheinfo mode,sha1,path (new syntax)' '
 	test_cmp expect actual
 '
 
+test_expect_success '.lock files cleaned up' '
+	mkdir cleanup &&
+	(
+	cd cleanup &&
+	mkdir worktree &&
+	git init repo &&
+	cd repo &&
+	git config core.worktree ../../worktree &&
+	# --refresh triggers late setup_work_tree,
+	# active_cache_changed is zero, rollback_lock_file fails
+	git update-index --refresh &&
+	! test -f .git/index.lock
+	)
+'
+
 test_done
-- 
2.1.0

Re: [PATCH v4 0/1] Use absolute paths of lockfiles

[Duy Nguyen]

On Sat, Sep 6, 2014 at 5:31 PM, Michael Haggerty <mhagger@alum.mit.edu> wrote:
> So I've shamelessly labeled this "v4" of his patch series and I've
> left Duy as the author, because his commit message (which I used
> directly) has far more intellectual content than the code change. Duy,
> if that's not OK with you, please let me know.

Not a problem. Thanks for picking it up.
-- 
Duy

Re: [PATCH v4 0/1] Use absolute paths of lockfiles

[Yue Lin Ho]

Hi Duy, Michael, Junio C Hamano:

Thanks for working on lock file issue.

Thank you!  Thank you~

^_^

Yue Lin Ho



--
View this message in context: http://git.661346.n2.nabble.com/What-s-cooking-in-git-git-Aug-2014-02-Fri-8-tp7616651p7618314.html
Sent from the git mailing list archive at Nabble.com.

Re: [PATCH v4 0/1] Use absolute paths of lockfiles

[Yue Lin Ho]

Hi Michael:

Good Morning. :)

I see mh/lockfile and mh/lockfile-stdio were ​graduated to "master".
So. does this patch continue?
On top of mh/lockfile-stdio?

Thank you. ^_^

Yue Lin Ho



--
View this message in context: http://git.661346.n2.nabble.com/What-s-cooking-in-git-git-Aug-2014-02-Fri-8-tp7616651p7619900.html
Sent from the git mailing list archive at Nabble.com.