What's cooking in git.git (Aug 2016, #01; Tue, 2)

What's cooking in git.git (Aug 2016, #01; Tue, 2)

[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.

On the 'master' front, the individual commit count now exceeds 400
since the last major release, which is a good pace.  We may want to
start slowing down once the current crop of topics in 'next' hits
the 'master' and switch our attention to regression hunting.  The
'maint' branch has been accumulating enough material to make it the
next maintenance release v2.9.3.

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]

* ab/gitweb-link-html-escape (2016-08-01) 1 commit
 - gitweb: escape link body in format_ref_marker

 The characters in the label shown for tags/refs for commits shown
 in "gitweb" output are now properly escaped for proper HTML output.

 Will merge to 'next'.


* ew/build-time-pager-tweaks (2016-08-01) 1 commit
 . pager: move pager-specific setup into the build

 The build procedure learned PAGER_ENV knob that lists what default
 environment variable settings to export for popular pagers.  This
 mechanism is used to tweak the default settings to MORE on FreeBSD.

 Waiting for a reroll.


* ib/t3700-add-chmod-x-updates (2016-08-01) 3 commits
 - t3700: add a test_mode_in_index helper function
 - t3700: merge two tests into one
 - t3700: remove unwanted leftover files before running new tests

 The t3700 test about "add --chmod=-x" have been made a bit more
 robust and generally cleaned up.

 Will merge to 'next'.


* jt/format-patch-from-config (2016-08-01) 1 commit
 - format-patch: format.from gives the default for --from

 "git format-patch" learned format.from configuration variable to
 specify the default settings for its "--from" option.


* rs/st-mult (2016-08-01) 1 commit
 - pass constants as first argument to st_mult()

 Micro optimization of st_mult() facility used to check the integer
 overflow coming from multiplication to compute size of memory
 allocation.

 Will merge to 'next'.


* rs/use-strbuf-addstr (2016-08-01) 1 commit
 - use strbuf_addstr() for adding constant strings to a strbuf

 Will merge to 'next'.


* sb/submodule-update-dot-branch (2016-08-01) 7 commits
 - submodule update: allow '.' for branch value
 - submodule--helper: add remote-branch helper
 - submodule-config: keep configured branch around
 - submodule--helper: fix usage string for relative-path
 - submodule update: narrow scope of local variable
 - submodule update: respect depth in subsequent fetches
 - t7406: future proof tests with hard coded depth

 A few updates to "git submodule update".

 Will merge to 'next'.


* jc/hashmap-doc-init (2016-08-02) 1 commit
 - hashmap: clarify that hashmap_entry can safely be discarded

 The API documentation for hashmap was unclear if hashmap_entry
 can be safely discarded without any other consideration.  State
 that it is safe to do so.

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

* jh/clean-smudge-annex (2016-08-01) 9 commits
 - use smudgeToFile filter in recursive merge
 - use smudgeToFile filter in git am
 - better recovery from failure of smudgeToFile filter
 - warn on unusable smudgeToFile/cleanFromFile config
 - use smudgeToFile in git checkout etc
 - use cleanFromFile in git add
 - add smudgeToFile and cleanFromFile filter configs
 - clarify %f documentation
 - Merge branch 'cc/apply-am' into HEAD
 (this branch uses cc/apply-am.)

 The interface to "clean/smudge" filters require Git to feed the
 whole contents via pipe, which is suboptimal for some applications.
 "cleanFromFile/smudgeToFile" commands are the moral equilvalents
 for these filters but they interact with the files on the
 filesystem directly.

 This is starting to bit-rot, as the topic it is built upon keeps
 getting rerolled.  I _think_ I rebased it correctly, but I would
 not be surprised if I made a mistake.

 Will discard if/when I have to do another rebase, preferring to
 have a fresh reroll directly from the author.


* sb/bisect (2016-04-15) 22 commits
 . SQUASH???
 . bisect: get back halfway shortcut
 . bisect: compute best bisection in compute_relevant_weights()
 . bisect: use a bottom-up traversal to find relevant weights
 . bisect: prepare for different algorithms based on find_all
 . bisect: rename count_distance() to compute_weight()
 . bisect: make total number of commits global
 . bisect: introduce distance_direction()
 . bisect: extract get_distance() function from code duplication
 . bisect: use commit instead of commit list as arguments when appropriate
 . bisect: replace clear_distance() by unique markers
 . bisect: use struct node_data array instead of int array
 . bisect: get rid of recursion in count_distance()
 . bisect: make algorithm behavior independent of DEBUG_BISECT
 . bisect: make bisect compile if DEBUG_BISECT is set
 . bisect: plug the biggest memory leak
 . bisect: add test for the bisect algorithm
 . t6030: generalize test to not rely on current implementation
 . t: use test_cmp_rev() where appropriate
 . t/test-lib-functions.sh: generalize test_cmp_rev
 . bisect: allow 'bisect run' if no good commit is known
 . bisect: write about `bisect next` in documentation

 The internal algorithm used in "git bisect" to find the next commit
 to check has been optimized greatly.

 Was expecting a reroll, but now pb/bisect topic starts removinging
 more and more parts from git-bisect.sh, this needs to see a fresh
 reroll.

 Will discard for now.
 cf. <1460294354-7031-1-git-send-email-s-beyer@gmx.net>




* sg/completion-updates (2016-02-28) 21 commits
 . completion: cache the path to the repository
 . completion: extract repository discovery from __gitdir()
 . completion: don't guard git executions with __gitdir()
 . completion: consolidate silencing errors from git commands
 . completion: don't use __gitdir() for git commands
 . completion: respect 'git -C <path>'
 . completion: fix completion after 'git -C <path>'
 . completion: don't offer commands when 'git --opt' needs an argument
 . rev-parse: add '--absolute-git-dir' option
 . completion: list short refs from a remote given as a URL
 . completion: don't list 'HEAD' when trying refs completion outside of a repo
 . completion: list refs from remote when remote's name matches a directory
 . completion: respect 'git --git-dir=<path>' when listing remote refs
 . completion: fix most spots not respecting 'git --git-dir=<path>'
 . completion: ensure that the repository path given on the command line exists
 . completion tests: add tests for the __git_refs() helper function
 . completion tests: check __gitdir()'s output in the error cases
 . completion tests: consolidate getting path of current working directory
 . completion tests: make the $cur variable local to the test helper functions
 . completion tests: don't add test cruft to the test repository
 . completion: improve __git_refs()'s in-code documentation

 Will be rerolled.
 cf. <1456754714-25237-1-git-send-email-szeder@ira.uka.de>


* ec/annotate-deleted (2015-11-20) 1 commit
 - annotate: skip checking working tree if a revision is provided

 Usability fix for annotate-specific "<file> <rev>" syntax with deleted
 files.

 Waiting for review.


* dk/gc-more-wo-pack (2016-01-13) 4 commits
 - gc: clean garbage .bitmap files from pack dir
 - t5304: ensure non-garbage files are not deleted
 - t5304: test .bitmap garbage files
 - prepare_packed_git(): find more garbage

 Follow-on to dk/gc-idx-wo-pack topic, to clean up stale
 .bitmap and .keep files.

 Waiting for a reroll.
 cf. <xmqq60ypbeng.fsf@gitster.mtv.corp.google.com>


* jc/diff-b-m (2015-02-23) 5 commits
 . WIPWIP
 . WIP: diff-b-m
 - diffcore-rename: allow easier debugging
 - diffcore-rename.c: add locate_rename_src()
 - diffcore-break: allow debugging

 "git diff -B -M" produced incorrect patch when the postimage of a
 completely rewritten file is similar to the preimage of a removed
 file; such a resulting file must not be expressed as a rename from
 other place.

 The fix in this patch is broken, unfortunately.
 Will discard.

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

* cc/apply-am (2016-08-01) 42 commits
 - fixup! apply: make it possible to silently apply
 - builtin/am: use apply api in run_apply()
 - apply: refactor `git apply` option parsing
 - apply: change error_routine when silent
 - usage: add get_error_routine() and get_warn_routine()
 - usage: add set_warn_routine()
 - apply: don't print on stdout in verbosity_silent mode
 - apply: make it possible to silently apply
 - write_or_die: use warning() instead of fprintf(stderr, ...)
 - environment: add set_index_file()
 - apply: use error_errno() where possible
 - apply: make some parsing functions static again
 - apply: move libified code from builtin/apply.c to apply.{c,h}
 - apply: rename and move opt constants to apply.h
 - builtin/apply: rename option parsing functions
 - builtin/apply: make create_one_file() return -1 on error
 - builtin/apply: make try_create_file() return -1 on error
 - builtin/apply: make write_out_results() return -1 on error
 - builtin/apply: make write_out_one_result() return -1 on error
 - builtin/apply: make create_file() return -1 on error
 - builtin/apply: make add_index_file() return -1 on error
 - builtin/apply: make add_conflicted_stages_file() return -1 on error
 - builtin/apply: make remove_file() return -1 on error
 - builtin/apply: make build_fake_ancestor() return -1 on error
 - builtin/apply: change die_on_unsafe_path() to check_unsafe_path()
 - builtin/apply: make gitdiff_*() return -1 on error
 - builtin/apply: make gitdiff_*() return 1 at end of header
 - builtin/apply: make parse_traditional_patch() return -1 on error
 - builtin/apply: make apply_all_patches() return 128 or 1 on error
 - builtin/apply: move check_apply_state() to apply.c
 - builtin/apply: make check_apply_state() return -1 instead of die()ing
 - apply: make init_apply_state() return -1 instead of exit()ing
 - builtin/apply: move init_apply_state() to apply.c
 - builtin/apply: make parse_ignorewhitespace_option() return -1 instead of die()ing
 - builtin/apply: make parse_whitespace_option() return -1 instead of die()ing
 - builtin/apply: make parse_single_patch() return -1 on error
 - builtin/apply: make parse_chunk() return a negative integer on error
 - builtin/apply: make find_header() return -128 instead of die()ing
 - builtin/apply: read_patch_file() return -1 instead of die()ing
 - builtin/apply: make apply_patch() return -1 or -128 instead of die()ing
 - apply: move 'struct apply_state' to apply.h
 - apply: make some names more specific
 (this branch is used by jh/clean-smudge-annex.)

 "git am" has been taught to make an internal call to "git apply"'s
 innards without spawning the latter as a separate process.

 Needs review.


* da/subtree-modernize (2016-07-27) 2 commits
 - subtree: adjust function definitions to match CodingGuidelines
 - subtree: adjust style to match CodingGuidelines
 (this branch uses da/subtree-2.9-regression.)

 Style fixes for "git subtree" (in contrib/).

 Will merge to 'next'.


* js/rebase-i-progress-tidy (2016-07-28) 1 commit
 - rebase-interactive: trim leading whitespace from progress count

 Regression fix for an i18n topic already in 'master'.

 Will merge to 'next'.


* jk/t4205-cleanup (2016-07-27) 2 commits
 - t4205: indent here documents
 - t4205: drop top-level &&-chaining

 Test modernization.

 Will merge to 'next'.


* jk/pack-objects-optim (2016-07-29) 7 commits
 - pack-objects: use mru list when iterating over packs
 - pack-objects: compute local/ignore_pack_keep early
 - pack-objects: break out of want_object loop early
 - find_pack_entry: replace last_found_pack with MRU cache
 - add generic most-recently-used list
 - sha1_file: drop free_pack_by_name
 - t/perf: add tests for many-pack scenarios

 "git pack-objects" has a few options that tell it not to pack
 objects found in certain packfiles, which require it to scan .idx
 files of all available packs.  The codepaths involved in these
 operations have been optimized for a common case of not having any
 non-local pack and/or any .kept pack.

 The last patch is still questionable in that it can attempt to
 create a cycle in delta-chain, only to be stopped by the last-ditch
 recovery logic in there.


* kw/patch-ids-optim (2016-07-29) 4 commits
 - rebase: avoid computing unnecessary patch IDs
 - patch-ids: add flag to create the diff patch id using header only data
 - patch-ids: replace the seen indicator with a commit pointer
 - patch-ids: stop using a hand-rolled hashmap implementation

 When "git rebase" tries to compare set of changes on the updated
 upstream and our own branch, it computes patch-id for all of these
 changes and attempts to find matches. This has been optimized by
 lazily computing the full patch-id (which is expensive) to be
 compared only for changes that touch the same set of paths.

 Will merge to 'next'.


* jk/rebase-i-drop-ident-check (2016-07-29) 1 commit
 - rebase-interactive: drop early check for valid ident

 Even when "git pull --rebase=preserve" (and the underlying "git
 rebase --preserve") can complete without creating any new commit
 (i.e. fast-forwards), it still insisted on having a usable ident
 information (read: user.email is set correctly), which was less
 than nice.  As the underlying commands used inside "git rebase"
 would fail with a more meaningful error message and advice text
 when the bogus ident matters, this extra check was removed.

 Will hold.
 cf. <20160729224944.GA23242@sigill.intra.peff.net>


* jk/reset-ident-time-per-commit (2016-08-01) 1 commit
 - am: reset cached ident date for each patch

 Not-so-recent rewrite of "git am" that started making internal
 calls into the commit machinery had an unintended regression, in
 that no matter how many seconds it took to apply many patches, the
 resulting committer timestamp for the resulting commits were all
 the same.

 Will merge to 'next'.


* da/subtree-2.9-regression (2016-07-26) 2 commits
  (merged to 'next' on 2016-07-26 at 9d71562)
 + subtree: fix "git subtree split --rejoin"
 + t7900-subtree.sh: fix quoting and broken && chains
 (this branch is used by da/subtree-modernize.)

 "git merge" in Git v2.9 was taught to forbid merging an unrelated
 lines of history by default, but that is exactly the kind of thing
 the "--rejoin" mode of "git subtree" (in contrib/) wants to do.
 "git subtree" has been taught to use the "--allow-unrelated-histories"
 option to override the default.

 Will merge to 'master'.


* nd/fetch-ref-summary (2016-07-26) 1 commit
 - t5510: skip tests under GETTEXT_POISON build

 Hotfix of a test in a topic that has already been merged to 'master'.

 Will merge to 'next'.


* os/no-verify-skips-commit-msg-too (2016-07-26) 1 commit
  (merged to 'next' on 2016-07-26 at 09b98b9)
 + commit: describe that --no-verify skips the commit-msg hook in the help text

 "git commit --help" said "--no-verify" is only about skipping the
 pre-commit hook, and failed to say that it also skipped the
 commit-msg hook.

 Will merge to 'master'.


* cp/completion-clone-recurse-submodules (2016-07-27) 1 commit
 - completion: add option '--recurse-submodules' to 'git clone'

 Will merge to 'next'.


* va/i18n (2016-07-28) 2 commits
 - i18n: config: unfold error messages marked for translation
 - i18n: notes: mark comment for translation

 More i18n marking.

 Will merge to 'next'.


* jc/grep-commandline-vs-configuration (2016-07-25) 1 commit
  (merged to 'next' on 2016-07-28 at dd53273)
 + grep: further simplify setting the pattern type

 "git -c grep.patternType=extended log --basic-regexp" misbehaved
 because the internal API to access the grep machinery was not
 designed well.

 Will merge to 'master'.


* jk/diff-do-not-reuse-wtf-needs-cleaning (2016-07-22) 1 commit
  (merged to 'next' on 2016-07-28 at e3c5190)
 + diff: do not reuse worktree files that need "clean" conversion

 There is an optimization used in "git diff $treeA $treeB" to borrow
 an already checked-out copy in the working tree when it is known to
 be the same as the blob being compared, expecting that open/mmap of
 such a file is faster than reading it from the object store, which
 involves inflating and applying delta.  This however kicked in even
 when the checked-out copy needs to go through the convert-to-git
 conversion (including the clean filter), which defeats the whole
 point of the optimization.  The optimization has been disabled when
 the conversion is necessary.

 Will merge to 'master'.


* jk/git-jump (2016-07-22) 3 commits
  (merged to 'next' on 2016-07-28 at 9ef9398)
 + contrib/git-jump: fix typo in README
 + contrib/git-jump: add whitespace-checking mode
 + contrib/git-jump: fix greedy regex when matching hunks

 "git jump" script (in contrib/) has been updated a bit.

 Will merge to 'master'.


* jk/parse-options-concat (2016-07-06) 1 commit
  (merged to 'next' on 2016-07-28 at 219bc3a)
 + parse_options: allocate a new array when concatenating

 Users of the parse_options_concat() API function needs to allocate
 extra slots in advance and fill them with OPT_END() when they want
 to decide the set of options to support dynamically, which is
 error-prone and hard to read.  This has been corrected by tweaking
 the API to allocate and return a new copy of "struct option" array.

 Will merge to 'master'.


* jk/push-progress (2016-07-20) 12 commits
  (merged to 'next' on 2016-07-28 at 39598fb)
 + receive-pack: send keepalives during quiet periods
 + receive-pack: turn on connectivity progress
 + receive-pack: relay connectivity errors to sideband
 + receive-pack: turn on index-pack resolving progress
 + index-pack: add flag for showing delta-resolution progress
 + clone: use a real progress meter for connectivity check
 + check_connected: add progress flag
 + check_connected: relay errors to alternate descriptor
 + check_everything_connected: use a struct with named options
 + check_everything_connected: convert to argv_array
 + rev-list: add optional progress reporting
 + check_everything_connected: always pass --quiet to rev-list

 "git push" and "git clone" learned to give better progress meters
 to the end user who is waiting on the terminal.

 Will merge to 'master'.


* jk/reflog-date (2016-07-27) 7 commits
 - date: clarify --date=raw description
 - date: add "unix" format
 - date: document and test "raw-local" mode
 - doc/pretty-formats: explain shortening of %gd
 - doc/pretty-formats: describe index/time formats for %gd
 - doc/rev-list-options: explain "-g" output formats
 - doc/rev-list-options: clarify "commit@{Nth}" for "-g" option

 The reflog output format is documented better, and a new format
 --date=unix to report the seconds-since-epoch (without timezone)
 has been added.

 Will merge to 'next'.


* mm/status-suggest-merge-abort (2016-07-22) 1 commit
  (merged to 'next' on 2016-07-28 at b8b87d9)
 + status: suggest 'git merge --abort' when appropriate

 "git status" learned to suggest "merge --abort" during a conflicted
 merge, just like it already suggests "rebase --abort" during a
 conflicted rebase.

 Will merge to 'master'.


* pm/build-persistent-https-with-recent-go (2016-07-22) 2 commits
  (merged to 'next' on 2016-07-28 at f6e9115)
 + contrib/persistent-https: use Git version for build label
 + contrib/persistent-https: update ldflags syntax for Go 1.7+

 The build procedure for "git persistent-https" helper (in contrib/)
 has been updated so that it can be built with more recent versions
 of Go.

 Will merge to 'master'.


* sb/pack-protocol-doc-nak (2016-07-22) 1 commit
  (merged to 'next' on 2016-07-28 at 5c94e0e)
 + Documentation: pack-protocol correct NAK response

 A doc update.

 Will merge to 'master'.


* sb/submodule-clone-retry (2016-07-22) 2 commits
  (merged to 'next' on 2016-07-28 at 5487d28)
 + submodule-helper: fix indexing in clone retry error reporting path
 + git-submodule: forward exit code of git-submodule--helper more faithfully

 An earlier tweak to make "submodule update" retry a failing clone
 of submodules was buggy and caused segfault, which has been fixed.

 Will merge to 'master'.


* ew/git-svn-http-tests (2016-07-25) 2 commits
 - git svn: migrate tests to use lib-httpd
 - t/t91*: do not say how to avoid the tests

 Reuse the lib-httpd test infrastructure when testing the subversion
 integration that interacts with subversion repositories served over
 the http:// protocol.

 Will merge to 'next'.


* jk/push-force-with-lease-creation (2016-07-26) 3 commits
 - push: allow pushing new branches with --force-with-lease
 - push: add shorthand for --force-with-lease branch creation
 - Documentation/git-push: fix placeholder formatting

 "git push --force-with-lease" already had enough logic to allow
 ensuring that such a push results in creation of a ref (i.e. the
 receiving end did not have another push from sideways that would be
 discarded by our force-pushing), but didn't expose this possibility
 to the users.  It does so now.

 Will merge to 'next'.


* jt/fetch-large-handshake-window-on-http (2016-07-19) 1 commit
  (merged to 'next' on 2016-07-28 at 5606b14)
 + fetch-pack: grow stateless RPC windows exponentially

 "git fetch" exchanges batched have/ack messages between the sender
 and the receiver, initially doubling every time and then falling
 back to use the maximum window size.  The "smart http" transport,
 being an half-duplex protocol, outgrows the preset limit too
 quickly and becomes inefficient when interacting with a large
 repository.  The internal mechanism learned to grow the window size
 more aggressively when working with the "smart http" transport.

 Will merge to 'master'.


* rs/submodule-config-code-cleanup (2016-07-28) 4 commits
  (merged to 'next' on 2016-07-28 at e25450e)
 + submodule-config: fix test binary crashing when no arguments given
 + submodule-config: combine early return code into one goto
 + submodule-config: passing name reference for .gitmodule blobs
  (merged to 'next' on 2016-07-19 at 59dbd58)
 + submodule-config: use explicit empty string instead of strbuf in config_from()

 Code cleanup.

 Will merge to 'master'.


* js/am-3-merge-recursive-direct (2016-08-01) 16 commits
 - merge-recursive: flush output buffer even when erroring out
 - merge_trees(): ensure that the callers release output buffer
 - merge-recursive: offer an option to retain the output in 'obuf'
 - merge-recursive: write the commit title in one go
 - merge-recursive: flush output buffer before printing error messages
 - am -3: use merge_recursive() directly again
 - merge-recursive: switch to returning errors instead of dying
 - merge-recursive: handle return values indicating errors
 - merge-recursive: allow write_tree_from_memory() to error out
 - merge-recursive: avoid returning a wholesale struct
 - merge_recursive: abort properly upon errors
 - prepare the builtins for a libified merge_recursive()
 - merge-recursive: clarify code in was_tracked()
 - die(_("BUG")): avoid translating bug messages
 - die("bug"): report bugs consistently
 - t5520: verify that `pull --rebase` shows the helpful advice when failing

 "git am -3" calls "git merge-recursive" when it needs to fall back
 to a three-way merge; this call has been turned into an internal
 subroutine call instead of spawning a separate subprocess.

 These mostly looked sensible, but it is dubious if it is a good
 feature to send what is meant to the standard error to the standard
 output.

 Eyes from other people are highly appreciated, as my eyes (and the
 original author's, too) have rotten by staring many rerolls of the
 same topic and are not effective in spotting errors.


* sb/push-options (2016-07-14) 4 commits
  (merged to 'next' on 2016-07-19 at ee9a83a)
 + add a test for push options
 + push: accept push options
 + receive-pack: implement advertising and receiving push options
 + push options: {pre,post}-receive hook learns about push options

 "git push" learned to accept and pass extra options to the
 receiving end so that hooks can read and react to them.

 Will merge to 'master'.


* ew/http-walker (2016-07-18) 4 commits
  (merged to 'next' on 2016-07-18 at a430a97)
 + list: avoid incompatibility with *BSD sys/queue.h
  (merged to 'next' on 2016-07-13 at 8585c03)
 + http-walker: reduce O(n) ops with doubly-linked list
 + http: avoid disconnecting on 404s for loose objects
 + http-walker: remove unused parameter from fetch_object

 Optimize dumb http transport on the client side.

 Will merge to 'master'.


* nd/log-decorate-color-head-arrow (2016-07-12) 1 commit
 - log: decorate HEAD -> branch with the same color for arrow and HEAD

 An entry "git log --decorate" for the tip of the current branch is
 shown as "HEAD -> name" (where "name" is the name of the branch);
 paint the arrow in the same color as "HEAD", not in the color for
 commits.

 Comments?  Personally I find it more-or-less "Meh".


* jk/difftool-in-subdir (2016-07-28) 3 commits
 - difftool: use Git::* functions instead of passing around state
 - difftool: avoid $GIT_DIR and $GIT_WORK_TREE
 - difftool: fix argument handling in subdirs

 "git difftool <paths>..." started in a subdirectory failed to
 interpret the paths relative to that directory, which has been
 fixed.

 Will merge to 'next'.


* dp/autoconf-curl-ssl (2016-06-28) 1 commit
 - ./configure.ac: detect SSL in libcurl using curl-config

 The ./configure script generated from configure.ac was taught how
 to detect support of SSL by libcurl better.

 Needs review.


* jc/pull-rebase-ff (2016-07-28) 1 commit
 - pull: fast-forward "pull --rebase=true"

 "git pull --rebase", when there is no new commits on our side since
 we forked from the upstream, should be able to fast-forward without
 invoking "git rebase", but it didn't.

 Needs a real log message and a few tests.


* po/range-doc (2016-07-20) 8 commits
 - doc: revisions - clarify reachability examples
 - doc: revisions - define `reachable`
 - doc: gitrevisions - clarify 'latter case' is revision walk
 - doc: gitrevisions - use 'reachable' in page description
 - doc: give headings for the two and three dot notations
 - doc: show the actual left, right, and boundary marks
 - doc: revisions - name the left and right sides
 - doc: use 'symmetric difference' consistently

 Clarify various ways to specify the "revision ranges" in the
 documentation.

 Updates in 4/8 ("give headings") is reported to break formatting?
 cf. <57913C97.1030001@xiplink.com>


* ex/deprecate-empty-pathspec-as-match-all (2016-06-22) 1 commit
  (merged to 'next' on 2016-07-13 at d9ca7fb)
 + pathspec: warn on empty strings as pathspec

 An empty string used as a pathspec element has always meant
 'everything matches', but it is too easy to write a script that
 finds a path to remove in $path and run 'git rm "$paht"', which
 ends up removing everything.  Start warning about this use of an
 empty string used for 'everything matches' and ask users to use a
 more explicit '.' for that instead.

 The hope is that existing users will not mind this change, and
 eventually the warning can be turned into a hard error, upgrading
 the deprecation into removal of this (mis)feature.

 Will hold to see if people scream.


* mh/ref-store (2016-06-20) 38 commits
 - refs: implement iteration over only per-worktree refs
 - refs: make lock generic
 - refs: add method to rename refs
 - refs: add methods to init refs db
 - refs: make delete_refs() virtual
 - refs: add method for initial ref transaction commit
 - refs: add methods for reflog
 - refs: add method iterator_begin
 - files_ref_iterator_begin(): take a ref_store argument
 - split_symref_update(): add a files_ref_store argument
 - lock_ref_sha1_basic(): add a files_ref_store argument
 - lock_ref_for_update(): add a files_ref_store argument
 - commit_ref_update(): add a files_ref_store argument
 - lock_raw_ref(): add a files_ref_store argument
 - repack_without_refs(): add a files_ref_store argument
 - refs: make peel_ref() virtual
 - refs: make create_symref() virtual
 - refs: make pack_refs() virtual
 - refs: make verify_refname_available() virtual
 - refs: make read_raw_ref() virtual
 - resolve_gitlink_ref(): rename path parameter to submodule
 - resolve_gitlink_ref(): avoid memory allocation in many cases
 - resolve_gitlink_ref(): implement using resolve_ref_recursively()
 - resolve_ref_recursively(): new function
 - read_raw_ref(): take a (struct ref_store *) argument
 - resolve_gitlink_packed_ref(): remove function
 - resolve_packed_ref(): rename function from resolve_missing_loose_ref()
 - refs: reorder definitions
 - refs: add a transaction_commit() method
 - {lock,commit,rollback}_packed_refs(): add files_ref_store arguments
 - resolve_missing_loose_ref(): add a files_ref_store argument
 - get_packed_ref(): add a files_ref_store argument
 - add_packed_ref(): add a files_ref_store argument
 - refs: create a base class "ref_store" for files_ref_store
 - refs: add a backend method structure
 - refs: rename struct ref_cache to files_ref_store
 - rename_ref_available(): add docstring
 - resolve_gitlink_ref(): eliminate temporary variable

 The ref-store abstraction was introduced to the refs API so that we
 can plug in different backends to store references.

 Needs a fixup.
 cf. <576D9885.2020901@ramsayjones.plus.com>


* jc/blame-reverse (2016-06-14) 2 commits
 - blame: dwim "blame --reverse OLD" as "blame --reverse OLD.."
 - blame: improve diagnosis for "--reverse NEW"

 It is a common mistake to say "git blame --reverse OLD path",
 expecting that the command line is dwimmed as if asking how lines
 in path in an old revision OLD have survived up to the current
 commit.

 Any supporters?  Otherwise will drop.


* nd/shallow-deepen (2016-06-13) 27 commits
 - fetch, upload-pack: --deepen=N extends shallow boundary by N commits
 - upload-pack: add get_reachable_list()
 - upload-pack: split check_unreachable() in two, prep for get_reachable_list()
 - t5500, t5539: tests for shallow depth excluding a ref
 - clone: define shallow clone boundary with --shallow-exclude
 - fetch: define shallow boundary with --shallow-exclude
 - upload-pack: support define shallow boundary by excluding revisions
 - refs: add expand_ref()
 - t5500, t5539: tests for shallow depth since a specific date
 - clone: define shallow clone boundary based on time with --shallow-since
 - fetch: define shallow boundary with --shallow-since
 - upload-pack: add deepen-since to cut shallow repos based on time
 - shallow.c: implement a generic shallow boundary finder based on rev-list
 - fetch-pack: use a separate flag for fetch in deepening mode
 - fetch-pack.c: mark strings for translating
 - fetch-pack: use a common function for verbose printing
 - fetch-pack: use skip_prefix() instead of starts_with()
 - upload-pack: move rev-list code out of check_non_tip()
 - upload-pack: make check_non_tip() clean things up on error
 - upload-pack: tighten number parsing at "deepen" lines
 - upload-pack: use skip_prefix() instead of starts_with()
 - upload-pack: move "unshallow" sending code out of deepen()
 - upload-pack: remove unused variable "backup"
 - upload-pack: move "shallow" sending code out of deepen()
 - upload-pack: move shallow deepen code out of receive_needs()
 - transport-helper.c: refactor set_helper_option()
 - remote-curl.c: convert fetch_git() to use argv_array

 The existing "git fetch --depth=<n>" option was hard to use
 correctly when making the history of an existing shallow clone
 deeper.  A new option, "--deepen=<n>", has been added to make this
 easier to use.  "git clone" also learned "--shallow-since=<date>"
 and "--shallow-exclude=<tag>" options to make it easier to specify
 "I am interested only in the recent N months worth of history" and
 "Give me only the history since that version".

 Needs review.

 Rerolled.  What this topic attempts to achieve is worthwhile, I
 would think.


* jc/attr-more (2016-06-09) 8 commits
 - attr.c: outline the future plans by heavily commenting
 - attr.c: always pass check[] to collect_some_attrs()
 - attr.c: introduce empty_attr_check_elems()
 - attr.c: correct ugly hack for git_all_attrs()
 - attr.c: rename a local variable check
 - fixup! d5ad6c13
 - attr.c: pass struct git_attr_check down the callchain
 - attr.c: add push_stack() helper
 (this branch uses jc/attr; is tangled with sb/pathspec-label and sb/submodule-default-paths.)

 The beginning of long and tortuous journey to clean-up attribute
 subsystem implementation.

 Needs to be redone.


* mh/connect (2016-06-06) 10 commits
 - connect: [host:port] is legacy for ssh
 - connect: move ssh command line preparation to a separate function
 - connect: actively reject git:// urls with a user part
 - connect: change the --diag-url output to separate user and host
 - connect: make parse_connect_url() return the user part of the url as a separate value
 - connect: group CONNECT_DIAG_URL handling code
 - connect: make parse_connect_url() return separated host and port
 - connect: re-derive a host:port string from the separate host and port variables
 - connect: call get_host_and_port() earlier
 - connect: document why we sometimes call get_port after get_host_and_port

 Rewrite Git-URL parsing routine (hopefully) without changing any
 behaviour.

 Comments?


* sb/submodule-default-paths (2016-06-20) 5 commits
 - completion: clone can recurse into submodules
 - clone: add --init-submodule=<pathspec> switch
 - submodule update: add `--init-default-path` switch
 - Merge branch 'sb/pathspec-label' into sb/submodule-default-paths
 - Merge branch 'jc/attr' into sb/submodule-default-paths
 (this branch uses jc/attr and sb/pathspec-label; is tangled with jc/attr-more.)

 Allow specifying the set of submodules the user is interested in on
 the command line of "git clone" that clones the superproject.


* jc/attr (2016-05-25) 18 commits
 - attr: support quoting pathname patterns in C style
 - attr: expose validity check for attribute names
 - attr: add counted string version of git_attr()
 - attr: add counted string version of git_check_attr()
 - attr: retire git_check_attrs() API
 - attr: convert git_check_attrs() callers to use the new API
 - attr: convert git_all_attrs() to use "struct git_attr_check"
 - attr: (re)introduce git_check_attr() and struct git_attr_check
 - attr: rename function and struct related to checking attributes
 - attr.c: plug small leak in parse_attr_line()
 - attr.c: tighten constness around "git_attr" structure
 - attr.c: simplify macroexpand_one()
 - attr.c: mark where #if DEBUG ends more clearly
 - attr.c: complete a sentence in a comment
 - attr.c: explain the lack of attr-name syntax check in parse_attr()
 - attr.c: update a stale comment on "struct match_attr"
 - attr.c: use strchrnul() to scan for one line
 - commit.c: use strchrnul() to scan for one line
 (this branch is used by jc/attr-more, sb/pathspec-label and sb/submodule-default-paths.)

 The attributes API has been updated so that it can later be
 optimized using the knowledge of which attributes are queried.

 I wanted to polish this topic further to make the attribute
 subsystem thread-ready, but because other topics depend on this
 topic and they do not (yet) need it to be thread-ready, let's merge
 this early part together with the dependent topics to 'next', and
 back-burner the threading enhancement to another day.


* pb/bisect (2016-08-02) 13 commits
 . bisect--helper: `bisect_start` shell function partially in C
 . bisect--helper: `get_terms` & `bisect_terms` shell function in C
 . bisect--helper: `bisect_next_check` shell function in C
 . bisect--helper: `check_and_set_terms` shell function in C
 . bisect--helper: `bisect_write` shell function in C
 . bisect--helper: `is_expected_rev` & `check_expected_revs` shell function in C
 . bisect--helper: `bisect_reset` shell function in C
 . wrapper: move is_empty_file() and rename it as is_empty_or_missing_file()
 . t6030: explicitly test for bisection cleanup
 . bisect--helper: `bisect_clean_state` shell function in C
 . bisect--helper: `write_terms` shell function in C
 . bisect: rewrite `check_term_format` shell function in C
 . bisect--helper: use OPT_CMDMODE instead of OPT_BOOL

 GSoC "bisect" topic.

 I'd prefer to see early part solidified so that reviews can focus
 on the later part that is still in flux.  We are almost there but
 not quite yet.


* sb/pathspec-label (2016-06-03) 6 commits
 - pathspec: disable preload-index when attribute pathspec magic is in use
 - pathspec: allow escaped query values
 - pathspec: allow querying for attributes
 - pathspec: move prefix check out of the inner loop
 - pathspec: move long magic parsing out of prefix_pathspec
 - Documentation: fix a typo
 (this branch is used by sb/submodule-default-paths; uses jc/attr; is tangled with jc/attr-more.)

 The pathspec mechanism learned ":(attr:X)$pattern" pathspec magic
 to limit paths that match $pattern further by attribute settings.
 The preload-index mechanism is disabled when the new pathspec magic
 is in use (at least for now), because the attribute subsystem is
 not thread-ready.


* kn/ref-filter-branch-list (2016-05-17) 17 commits
 - branch: implement '--format' option
 - branch: use ref-filter printing APIs
 - branch, tag: use porcelain output
 - ref-filter: allow porcelain to translate messages in the output
 - ref-filter: add `:dir` and `:base` options for ref printing atoms
 - ref-filter: make remote_ref_atom_parser() use refname_atom_parser_internal()
 - ref-filter: introduce symref_atom_parser() and refname_atom_parser()
 - ref-filter: introduce refname_atom_parser_internal()
 - ref-filter: make "%(symref)" atom work with the ':short' modifier
 - ref-filter: add support for %(upstream:track,nobracket)
 - ref-filter: make %(upstream:track) prints "[gone]" for invalid upstreams
 - ref-filter: introduce format_ref_array_item()
 - ref-filter: move get_head_description() from branch.c
 - ref-filter: modify "%(objectname:short)" to take length
 - ref-filter: implement %(if:equals=<string>) and %(if:notequals=<string>)
 - ref-filter: include reference to 'used_atom' within 'atom_value'
 - ref-filter: implement %(if), %(then), and %(else) atoms

 The code to list branches in "git branch" has been consolidated
 with the more generic ref-filter API.

 Rerolled.
 This also really needs review.


* dt/index-helper (2016-07-06) 21 commits
 - index-helper: indexhelper.exitAfter config
 - trace: measure where the time is spent in the index-heavy operations
 - index-helper: optionally automatically run
 - index-helper: autorun mode
 - index-helper: don't run if already running
 - index-helper: kill mode
 - watchman: add a config option to enable the extension
 - unpack-trees: preserve index extensions
 - update-index: enable/disable watchman support
 - index-helper: use watchman to avoid refreshing index with lstat()
 - watchman: support watchman to reduce index refresh cost
 - read-cache: add watchman 'WAMA' extension
 - index-helper: log warnings
 - index-helper: add --detach
 - daemonize(): set a flag before exiting the main process
 - index-helper: add --strict
 - index-helper: new daemon for caching index and related stuff
 - unix-socket.c: add stub implementation when unix sockets are not supported
 - pkt-line: add gentle version of packet_write
 - read-cache: allow to keep mmap'd memory after reading
 - read-cache.c: fix constness of verify_hdr()

 A new "index-helper" daemon has been introduced to give newly
 spawned Git process a quicker access to the data in the index, and
 optionally interface with the watchman daemon to further reduce the
 refresh cost.

 Not quite ready yet, it seems.
 cf. <alpine.DEB.2.20.1607061016330.6426@virtualbox>
 cf. <CACsJy8AiER_=5aJ65r+GPCE_nXbrPTAMKJi=FuJgT8zzV2-NFw@mail.gmail.com>


* jc/bundle (2016-03-03) 6 commits
 - index-pack: --clone-bundle option
 - Merge branch 'jc/index-pack' into jc/bundle
 - bundle v3: the beginning
 - bundle: keep a copy of bundle file name in the in-core bundle header
 - bundle: plug resource leak
 - bundle doc: 'verify' is not about verifying the bundle

 The beginning of "split bundle", which could be one of the
 ingredients to allow "git clone" traffic off of the core server
 network to CDN.

 While I think it would make it easier for people to experiment and
 build on if the topic is merged to 'next', I am at the same time a
 bit reluctant to merge an unproven new topic that introduces a new
 file format, which we may end up having to support til the end of
 time.  Comments?


* jc/merge-drop-old-syntax (2015-04-29) 1 commit
 - merge: drop 'git merge <message> HEAD <commit>' syntax

 Stop supporting "git merge <message> HEAD <commit>" syntax that has
 been deprecated since October 2007, and issues a deprecation
 warning message since v2.5.0.

 It has been reported that git-gui still uses the deprecated syntax,
 which needs to be fixed before this final step can proceed.
 cf. <5671DB28.8020901@kdbg.org>

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

* ew/svn-authorsprog-doc (2016-07-19) 1 commit
 . git-svn: document svn.authorsProg in config

 Belated doc update.

 Pulled directly from upstream hence discarded.

Re: What's cooking in git.git (Aug 2016, #01; Tue, 2)

[Jakub Narębski]

W dniu 03.08.2016 o 00:24, Junio C Hamano pisze:

> --------------------------------------------------
> [Stalled]
> 
> * jh/clean-smudge-annex (2016-08-01) 9 commits
>  - use smudgeToFile filter in recursive merge
>  - use smudgeToFile filter in git am
>  - better recovery from failure of smudgeToFile filter
>  - warn on unusable smudgeToFile/cleanFromFile config
>  - use smudgeToFile in git checkout etc
>  - use cleanFromFile in git add
>  - add smudgeToFile and cleanFromFile filter configs
>  - clarify %f documentation
>  - Merge branch 'cc/apply-am' into HEAD
>  (this branch uses cc/apply-am.)
> 
>  The interface to "clean/smudge" filters require Git to feed the
>  whole contents via pipe, which is suboptimal for some applications.
>  "cleanFromFile/smudgeToFile" commands are the moral equilvalents
>  for these filters but they interact with the files on the
>  filesystem directly.
> 
>  This is starting to bit-rot, as the topic it is built upon keeps
>  getting rerolled.  I _think_ I rebased it correctly, but I would
>  not be surprised if I made a mistake.
> 
>  Will discard if/when I have to do another rebase, preferring to
>  have a fresh reroll directly from the author.

Could you apply the first part (the first patch) of the series,
namely:

   - clarify %f documentation

> * da/subtree-2.9-regression (2016-07-26) 2 commits
>   (merged to 'next' on 2016-07-26 at 9d71562)
>  + subtree: fix "git subtree split --rejoin"
>  + t7900-subtree.sh: fix quoting and broken && chains
>  (this branch is used by da/subtree-modernize.)
> 
>  "git merge" in Git v2.9 was taught to forbid merging an unrelated
>  lines of history by default, but that is exactly the kind of thing
>  the "--rejoin" mode of "git subtree" (in contrib/) wants to do.
>  "git subtree" has been taught to use the "--allow-unrelated-histories"
>  option to override the default.
> 
>  Will merge to 'master'.

Good. At least one Git user was bitten by this bug, see
<1BED74C8-2E4C-4CA7-B785-F0666B69C1A7@gmail.com>


P.S. I guess that filter.<driver>.process series is considered
     pre-cooking?

-- 
Jakub Narębski

Re: What's cooking in git.git (Aug 2016, #01; Tue, 2)

[Junio C Hamano]

On Wed, Aug 3, 2016 at 5:24 AM, Jakub Narębski <jnareb@gmail.com> wrote:>
> Could you apply the first part (the first patch) of the series,
> namely:
>
>    - clarify %f documentation

Thanks. That's a good idea.

> P.S. I guess that filter.<driver>.process series is considered
>      pre-cooking?

Yes. I've been waiting to see that the amount and quality of
comments from others indicate that the series passed
the phase that goes through frequent rerolls. Having a
serious review in the thread that demonstrates and
concludes that it is well designed, well implemented,
and ready to go would help, of course.

Re: What's cooking in git.git (Aug 2016, #01; Tue, 2)

[Lars Schneider]

> 
> * jk/push-force-with-lease-creation (2016-07-26) 3 commits
> - push: allow pushing new branches with --force-with-lease
> - push: add shorthand for --force-with-lease branch creation
> - Documentation/git-push: fix placeholder formatting
> 
> "git push --force-with-lease" already had enough logic to allow
> ensuring that such a push results in creation of a ref (i.e. the
> receiving end did not have another push from sideways that would be
> discarded by our force-pushing), but didn't expose this possibility
> to the users.  It does so now.
> 
> Will merge to 'next'.

t5533-push-cas.sh "16 - new branch already exists" seems to be broken 
for OSX on next. Git bisect indicates that "push: add shorthand for 
--force-with-lease branch creation" might be the culprit.

https://travis-ci.org/git/git/jobs/149614431
https://api.travis-ci.org/jobs/149614431/log.txt?deansi=true (non-JS)

- Lars

Re: What's cooking in git.git (Aug 2016, #01; Tue, 2)

[John Keeping]

On Thu, Aug 04, 2016 at 10:03:39AM +0200, Lars Schneider wrote:
> 
> > 
> > * jk/push-force-with-lease-creation (2016-07-26) 3 commits
> > - push: allow pushing new branches with --force-with-lease
> > - push: add shorthand for --force-with-lease branch creation
> > - Documentation/git-push: fix placeholder formatting
> > 
> > "git push --force-with-lease" already had enough logic to allow
> > ensuring that such a push results in creation of a ref (i.e. the
> > receiving end did not have another push from sideways that would be
> > discarded by our force-pushing), but didn't expose this possibility
> > to the users.  It does so now.
> > 
> > Will merge to 'next'.
> 
> t5533-push-cas.sh "16 - new branch already exists" seems to be broken 
> for OSX on next. Git bisect indicates that "push: add shorthand for 
> --force-with-lease branch creation" might be the culprit.
> 
> https://travis-ci.org/git/git/jobs/149614431
> https://api.travis-ci.org/jobs/149614431/log.txt?deansi=true (non-JS)

It seems that the test script has already done "test_commit C", so the
newly added "test_commit c" does nothing on a case-insensitive
filesystem.

Something like this will make the test more consistent with the rest of
the file:

diff --git a/t/t5533-push-cas.sh b/t/t5533-push-cas.sh
index 5f29664..e5bbbd8 100755
--- a/t/t5533-push-cas.sh
+++ b/t/t5533-push-cas.sh
@@ -220,7 +220,7 @@ test_expect_success 'new branch already exists' '
 	(
 		cd src &&
 		git checkout -b branch master &&
-		test_commit c
+		test_commit F
 	) &&
 	(
 		cd dst &&

Re: What's cooking in git.git (Aug 2016, #01; Tue, 2)

[Lars Schneider]

> On 04 Aug 2016, at 13:32, John Keeping <john@keeping.me.uk> wrote:
> 
> On Thu, Aug 04, 2016 at 10:03:39AM +0200, Lars Schneider wrote:
>> 
>>> 
>>> * jk/push-force-with-lease-creation (2016-07-26) 3 commits
>>> - push: allow pushing new branches with --force-with-lease
>>> - push: add shorthand for --force-with-lease branch creation
>>> - Documentation/git-push: fix placeholder formatting
>>> 
>>> "git push --force-with-lease" already had enough logic to allow
>>> ensuring that such a push results in creation of a ref (i.e. the
>>> receiving end did not have another push from sideways that would be
>>> discarded by our force-pushing), but didn't expose this possibility
>>> to the users.  It does so now.
>>> 
>>> Will merge to 'next'.
>> 
>> t5533-push-cas.sh "16 - new branch already exists" seems to be broken 
>> for OSX on next. Git bisect indicates that "push: add shorthand for 
>> --force-with-lease branch creation" might be the culprit.
>> 
>> https://travis-ci.org/git/git/jobs/149614431
>> https://api.travis-ci.org/jobs/149614431/log.txt?deansi=true (non-JS)
> 
> It seems that the test script has already done "test_commit C", so the
> newly added "test_commit c" does nothing on a case-insensitive
> filesystem.
> 
> Something like this will make the test more consistent with the rest of
> the file:
> 
> diff --git a/t/t5533-push-cas.sh b/t/t5533-push-cas.sh
> index 5f29664..e5bbbd8 100755
> --- a/t/t5533-push-cas.sh
> +++ b/t/t5533-push-cas.sh
> @@ -220,7 +220,7 @@ test_expect_success 'new branch already exists' '
> 	(
> 		cd src &&
> 		git checkout -b branch master &&
> -		test_commit c
> +		test_commit F
> 	) &&
> 	(
> 		cd dst &&

Confirmed. This patch fixes the issue!

Thanks,
Lars

Re: What's cooking in git.git (Aug 2016, #01; Tue, 2)

[Johannes Schindelin]

Hi Lars & John,

On Thu, 4 Aug 2016, Lars Schneider wrote:

> > On 04 Aug 2016, at 13:32, John Keeping <john@keeping.me.uk> wrote:
> > 
> > On Thu, Aug 04, 2016 at 10:03:39AM +0200, Lars Schneider wrote:
> >> 
> >>> * jk/push-force-with-lease-creation (2016-07-26) 3 commits
> >>> - push: allow pushing new branches with --force-with-lease
> >>> - push: add shorthand for --force-with-lease branch creation
> >>> - Documentation/git-push: fix placeholder formatting
> >>> 
> >>> "git push --force-with-lease" already had enough logic to allow
> >>> ensuring that such a push results in creation of a ref (i.e. the
> >>> receiving end did not have another push from sideways that would be
> >>> discarded by our force-pushing), but didn't expose this possibility
> >>> to the users.  It does so now.
> >>> 
> >>> Will merge to 'next'.
> >> 
> >> t5533-push-cas.sh "16 - new branch already exists" seems to be broken 
> >> for OSX on next. Git bisect indicates that "push: add shorthand for 
> >> --force-with-lease branch creation" might be the culprit.
> >> 
> >> https://travis-ci.org/git/git/jobs/149614431
> >> https://api.travis-ci.org/jobs/149614431/log.txt?deansi=true (non-JS)
> > 
> > It seems that the test script has already done "test_commit C", so the
> > newly added "test_commit c" does nothing on a case-insensitive
> > filesystem.
> > 
> > Something like this will make the test more consistent with the rest of
> > the file:
> > 
> > diff --git a/t/t5533-push-cas.sh b/t/t5533-push-cas.sh
> > index 5f29664..e5bbbd8 100755
> > --- a/t/t5533-push-cas.sh
> > +++ b/t/t5533-push-cas.sh
> > @@ -220,7 +220,7 @@ test_expect_success 'new branch already exists' '
> > 	(
> > 		cd src &&
> > 		git checkout -b branch master &&
> > -		test_commit c
> > +		test_commit F
> > 	) &&
> > 	(
> > 		cd dst &&
> 
> Confirmed. This patch fixes the issue!

Funny. I worked heads-down to have some kind of Continuous Integration to
run on my laptop, and this breakage came up. I fixed it locally, and only
then did it occur to me that it might have been fixed already, and then I
found this mail with a patch identical to mine.

Will send out the patch in a moment.

Thanks,
Dscho

Re: What's cooking in git.git (Aug 2016, #01; Tue, 2)

[Junio C Hamano]

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

>> > Something like this will make the test more consistent with the rest of
>> > the file:
>> > 
>> > diff --git a/t/t5533-push-cas.sh b/t/t5533-push-cas.sh
>> > index 5f29664..e5bbbd8 100755
>> > --- a/t/t5533-push-cas.sh
>> > +++ b/t/t5533-push-cas.sh
>> > @@ -220,7 +220,7 @@ test_expect_success 'new branch already exists' '
>> > 	(
>> > 		cd src &&
>> > 		git checkout -b branch master &&
>> > -		test_commit c
>> > +		test_commit F
>> > 	) &&
>> > 	(
>> > 		cd dst &&
>> 
>> Confirmed. This patch fixes the issue!
>
> Funny. I worked heads-down to have some kind of Continuous Integration to
> run on my laptop, and this breakage came up. I fixed it locally, and only
> then did it occur to me that it might have been fixed already, and then I
> found this mail with a patch identical to mine.
>
> Will send out the patch in a moment.

Thanks.