Permalink
Commits on Jan 18, 2017
  1. Merge branch 'sb/cd-then-git-can-be-written-as-git-c' into next

    Test clean-up.
    
    * sb/cd-then-git-can-be-written-as-git-c:
      lib-submodule-update.sh: reduce use of subshell by using "git -C"
    gitster committed Jan 18, 2017
  2. Merge branch 'ad/bisect-terms' into next

    Documentation fix.
    
    * ad/bisect-terms:
      Documentation/bisect: improve on (bad|new) and (good|bad)
    gitster committed Jan 18, 2017
  3. Merge branch 'sg/fix-versioncmp-with-common-suffix' into next

    The prereleaseSuffix feature of version comparison that is used in
    "git tag -l" did not correctly when two or more prereleases for the
    same release were present (e.g. when 2.0, 2.0-beta1, and 2.0-beta2
    are there and the code needs to compare 2.0-beta1 and 2.0-beta2).
    
    * sg/fix-versioncmp-with-common-suffix:
      versioncmp: generalize version sort suffix reordering
      versioncmp: factor out helper for suffix matching
      versioncmp: use earliest-longest contained suffix to determine sorting order
      versioncmp: cope with common part overlapping with prerelease suffix
      versioncmp: pass full tagnames to swap_prereleases()
      t7004-tag: add version sort tests to show prerelease reordering issues
      t7004-tag: use test_config helper
      t7004-tag: delete unnecessary tags with test_when_finished
    gitster committed Jan 18, 2017
  4. Merge branch 'vn/diff-ihc-config' into next

    "git diff" learned diff.interHunkContext configuration variable
    that gives the default value for its --inter-hunk-context option.
    
    * vn/diff-ihc-config:
      diff: add interhunk context config option
    gitster committed Jan 18, 2017
  5. Merge branch 'sb/submodule-init' into next

    Error message fix.
    
    * sb/submodule-init:
      submodule update --init: display correct path from submodule
    gitster committed Jan 18, 2017
  6. Merge branch 'sb/submodule-embed-gitdir' into next

    Help-text fix.
    
    * sb/submodule-embed-gitdir:
      submodule absorbgitdirs: mention in docstring help
    gitster committed Jan 18, 2017
  7. Merge branch 'sb/submodule-config-tests' into next

    Test updates.
    
    * sb/submodule-config-tests:
      t7411: test lookup of uninitialized submodules
      t7411: quote URLs
    gitster committed Jan 18, 2017
  8. Merge branch 'jk/vreport-sanitize' into next

    An error message with an ASCII control character like '\r' in it
    can alter the message to hide its early part, which is problematic
    when a remote side gives such an error message that the local side
    will relay with a "remote: " prefix.
    
    * jk/vreport-sanitize:
      vreport: sanitize ASCII control chars
      Revert "vreportf: avoid intermediate buffer"
    gitster committed Jan 18, 2017
  9. Merge branch 'jk/grep-e-could-be-extended-beyond-posix' into next

    Tighten a test to avoid mistaking an extended ERE regexp engine as
    a PRE regexp engine.
    
    * jk/grep-e-could-be-extended-beyond-posix:
      t7810: avoid assumption about invalid regex syntax
    gitster committed Jan 18, 2017
  10. Merge branch 'bw/read-blob-data-does-not-modify-index-state' into next

    Code clean-up.
    
    * bw/read-blob-data-does-not-modify-index-state:
      index: improve constness for reading blob data
    gitster committed Jan 18, 2017
  11. Merge branch 'master' into next

    * master:
      gitk: Remove translated message from comments
      gitk: ru.po: Update Russian translation
      gitk: Update copyright notice to 2016
      gitk: Clear array 'commitinfo' on reload
      gitk: Remove closed file descriptors from $blobdifffd
      gitk: Turn off undo manager in the text widget
      gitk: Fix Japanese translation for "marked commit"
      gitk: Fix missing commits when using -S or -G
      gitk: Use explicit RGB green instead of "lime"
      gitk: Add Portuguese translation
      gitk: Makefile: create install bin directory
      gitk: Include commit title in branch dialog
      gitk: Allow checking out a remote branch
      gitk: Add a 'rename' option to the branch context menu
    gitster committed Jan 18, 2017
  12. Merge git://ozlabs.org/~paulus/gitk

    * 'master' of git://ozlabs.org/~paulus/gitk:
      gitk: Remove translated message from comments
      gitk: ru.po: Update Russian translation
      gitk: Update copyright notice to 2016
      gitk: Clear array 'commitinfo' on reload
      gitk: Remove closed file descriptors from $blobdifffd
      gitk: Turn off undo manager in the text widget
      gitk: Fix Japanese translation for "marked commit"
      gitk: Fix missing commits when using -S or -G
      gitk: Use explicit RGB green instead of "lime"
      gitk: Add Portuguese translation
      gitk: Makefile: create install bin directory
      gitk: Include commit title in branch dialog
      gitk: Allow checking out a remote branch
      gitk: Add a 'rename' option to the branch context menu
    gitster committed Jan 18, 2017
  13. gitk: Remove translated message from comments

    "make update-po" fails because a previously untranslated string
    has now been translated:
    
    	Updating po/sv.po
    	po/sv.po:1388: duplicate message definition...
    	po/sv.po:380: ...this is the location of the first definition
    
    Remove the duplicate message definition.
    
    Reported-by: Junio C Hamano <gitster@pobox.com>
    Signed-off-by: David Aguilar <davvid@gmail.com>
    Signed-off-by: Paul Mackerras <paulus@ozlabs.org>
    davvid committed with Paul Mackerras Jan 18, 2017
Commits on Jan 17, 2017
  1. Sync with master

    * master:
      RelNotes: drop merge-later comments for maint
      Almost ready for 2.11.1
    gitster committed Jan 17, 2017
  2. RelNotes: drop merge-later comments for maint

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Jan 17, 2017
  3. Merge branch 'maint'

    gitster committed Jan 17, 2017
  4. Almost ready for 2.11.1

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Jan 17, 2017
  5. Merge branch 'mm/gc-safety-doc' into maint

    Doc update.
    
    * mm/gc-safety-doc:
      git-gc.txt: expand discussion of races with other processes
    gitster committed Jan 17, 2017
  6. Merge branch 'mm/push-social-engineering-attack-doc' into maint

    Doc update on fetching and pushing.
    
    * mm/push-social-engineering-attack-doc:
      doc: mention transfer data leaks in more places
    gitster committed Jan 17, 2017
  7. Merge branch 'jt/fetch-no-redundant-tag-fetch-map' into maint

    Code cleanup to avoid using redundant refspecs while fetching with
    the --tags option.
    
    * jt/fetch-no-redundant-tag-fetch-map:
      fetch: do not redundantly calculate tag refmap
    gitster committed Jan 17, 2017
  8. Merge branch 'ls/filter-process' into maint

    Doc update.
    
    * ls/filter-process:
      t0021: fix flaky test
      docs: warn about possible '=' in clean/smudge filter process values
    gitster committed Jan 17, 2017
  9. Merge branch 'kh/tutorial-grammofix' into maint

    * kh/tutorial-grammofix:
      doc: omit needless "for"
      doc: make the intent of sentence clearer
      doc: add verb in front of command to run
      doc: add articles (grammar)
    gitster committed Jan 17, 2017
  10. Merge branch 'lr/doc-fix-cet' into maint

    * lr/doc-fix-cet:
      date-formats.txt: Typo fix
    gitster committed Jan 17, 2017
  11. Merge branch 'sb/t3600-cleanup' into maint

    Code cleanup.
    
    * sb/t3600-cleanup:
      t3600: slightly modernize style
      t3600: remove useless redirect
    gitster committed Jan 17, 2017
  12. Merge branch 'jk/readme-gmane-is-no-more' into maint

    * jk/readme-gmane-is-no-more:
      README: replace gmane link with public-inbox
    gitster committed Jan 17, 2017
  13. Merge branch 'sb/unpack-trees-grammofix' into maint

    * sb/unpack-trees-grammofix:
      unpack-trees: fix grammar for untracked files in directories
    gitster committed Jan 17, 2017
  14. Merge branch 'ls/t0021-fixup' into maint

    * ls/t0021-fixup:
      t0021: minor filter process test cleanup
    gitster committed Jan 17, 2017
  15. Merge branch 'ak/lazy-prereq-mktemp' into maint

    Test code clean-up.
    
    * ak/lazy-prereq-mktemp:
      t7610: clean up foo.XXXXXX tmpdir
    gitster committed Jan 17, 2017
  16. Merge branch 'nd/qsort-in-merge-recursive' into maint

    Code simplification.
    
    * nd/qsort-in-merge-recursive:
      merge-recursive.c: use string_list_sort instead of qsort
    gitster committed Jan 17, 2017
  17. Merge branch 'dt/smart-http-detect-server-going-away' into maint

    When the http server gives an incomplete response to a smart-http
    rpc call, it could lead to client waiting for a full response that
    will never come.  Teach the client side to notice this condition
    and abort the transfer.
    
    An improvement counterproposal has failed.
    cf. <20161114194049.mktpsvgdhex2f4zv@sigill.intra.peff.net>
    
    * dt/smart-http-detect-server-going-away:
      upload-pack: optionally allow fetching any sha1
      remote-curl: don't hang when a server dies before any output
    gitster committed Jan 17, 2017
  18. Merge branch 'mk/mingw-winansi-ttyname-termination-fix' into maint

    A potential but unlikely buffer overflow in Windows port has been
    fixed.
    
    * mk/mingw-winansi-ttyname-termination-fix:
      mingw: consider that UNICODE_STRING::Length counts bytes
    gitster committed Jan 17, 2017
  19. Merge branch 'gv/p4-multi-path-commit-fix' into maint

    "git p4" that tracks multile p4 paths imported a single changelist
    that touches files in these multiple paths as one commit, followed
    by many empty commits.  This has been fixed.
    
    * gv/p4-multi-path-commit-fix:
      git-p4: fix multi-path changelist empty commits
    gitster committed Jan 17, 2017
  20. Merge branch 'jk/difftool-in-subdir' into maint

    Even though an fix was attempted in Git 2.9.3 days, but running
    "git difftool --dir-diff" from a subdirectory never worked. This
    has been fixed.
    
    * jk/difftool-in-subdir:
      difftool: rename variables for consistency
      difftool: chdir as early as possible
      difftool: sanitize $workdir as early as possible
      difftool: fix dir-diff index creation when in a subdirectory
    gitster committed Jan 17, 2017
  21. Merge branch 'ld/p4-compare-dir-vs-symlink' into maint

    "git p4" misbehaved when swapping a directory and a symbolic link.
    
    * ld/p4-compare-dir-vs-symlink:
      git-p4: avoid crash adding symlinked directory
    gitster committed Jan 17, 2017
  22. Merge branch 'jc/push-default-explicit' into maint

    A lazy "git push" without refspec did not internally use a fully
    specified refspec to perform 'current', 'simple', or 'upstream'
    push, causing unnecessary "ambiguous ref" errors.
    
    * jc/push-default-explicit:
      push: test pushing ambiguously named branches
      push: do not use potentially ambiguous default refspec
    gitster committed Jan 17, 2017