Skip to content


Subversion checkout URL

You can clone with
Download ZIP
Commits on Jun 27, 2015
  1. @jiangxin

    l10n: git.pot: v2.5.0 round 1 (65 new, 15 removed)

    jiangxin authored
    Generate po/git.pot from v2.5.0-rc0 for git v2.5.0 l10n round 1.
    Signed-off-by: Jiang Xin <>
Commits on Jun 25, 2015
  1. @gitster

    Git 2.5.0-rc0

    gitster authored
    Signed-off-by: Junio C Hamano <>
  2. @gitster

    Merge branch 'cn/cvsimport-perl-update'

    gitster authored
    * cn/cvsimport-perl-update:
      cvsimport: silence regex warning appearing in Perl 5.22.
  3. @gitster

    Merge branch 'cb/array-size'

    gitster authored
    * cb/array-size:
      Fix definition of ARRAY_SIZE for non-gcc builds
  4. @gitster

    Sync with 2.4.5

    gitster authored
  5. @gitster

    Git 2.4.5

    gitster authored
    Signed-off-by: Junio C Hamano <>
  6. @gitster

    Merge branch 'sg/merge-summary-config' into maint

    gitster authored
    Doc updates.
    * sg/merge-summary-config:
      Documentation: include 'merge.branchdesc' for merge and config as well
  7. @gitster

    Merge branch 'jk/make-fix-dependencies' into maint

    gitster authored
    Build clean-up.
    * jk/make-fix-dependencies:
      Makefile: silence perl/PM.stamp recipe
      Makefile: avoid timestamp updates to GIT-BUILD-OPTIONS
      Makefile: drop dependency between git-instaweb and gitweb
  8. @gitster

    Merge branch 'sb/pack-protocol-mention-smart-http' into maint

    gitster authored
    Doc updates.
    * sb/pack-protocol-mention-smart-http:
      Documentation/technical/pack-protocol: mention http as possible protocol
  9. @gitster

    Merge branch 'jk/die-on-bogus-worktree-late' into maint

    gitster authored
    The setup code used to die when core.bare and core.worktree are set
    inconsistently, even for commands that do not need working tree.
    * jk/die-on-bogus-worktree-late:
      setup_git_directory: delay core.bare/core.worktree errors
  10. @gitster

    Merge branch 'pt/pull-tags-error-diag' into maint

    gitster authored
    There was a dead code that used to handle "git pull --tags" and
    show special-cased error message, which was made irrelevant when
    the semantics of the option changed back in Git 1.9 days.
    * pt/pull-tags-error-diag:
      pull: remove --tags error in no merge candidates case
  11. @gitster

    Merge branch 'jk/color-diff-plain-is-context' into maint

    gitster authored
    "color.diff.plain" was a misnomer; give it 'color.diff.context' as
    a more logical synonym.
    * jk/color-diff-plain-is-context:
      diff.h: rename DIFF_PLAIN color slot to DIFF_CONTEXT
      diff: accept color.diff.context as a synonym for "plain"
  12. @gitster

    Merge branch 'jk/diagnose-config-mmap-failure' into maint

    gitster authored
    The configuration reader/writer uses mmap(2) interface to access
    the files; when we find a directory, it barfed with "Out of memory?".
    * jk/diagnose-config-mmap-failure:
      xmmap(): drop "Out of memory?"
      config.c: rewrite ENODEV into EISDIR when mmap fails
      config.c: avoid xmmap error messages
      config.c: fix mmap leak when writing config
      read-cache.c: drop PROT_WRITE from mmap of index
  13. @gitster

    Merge branch 'jk/squelch-missing-link-warning-for-unreachable' into m…

    gitster authored
    Recent "git prune" traverses young unreachable objects to safekeep
    old objects in the reachability chain from them, which sometimes
    caused error messages that are unnecessarily alarming.
    * jk/squelch-missing-link-warning-for-unreachable:
      suppress errors on missing UNINTERESTING links
      silence broken link warnings with revs->ignore_missing_links
      add quieter versions of parse_{tree,commit}
  14. @gitster

    Merge branch 'mm/rebase-i-post-rewrite-exec' into maint

    gitster authored
    "git rebase -i" fired post-rewrite hook when it shouldn't (namely,
    when it was told to stop sequencing with 'exec' insn).
    * mm/rebase-i-post-rewrite-exec:
      t5407: use <<- to align the expected output
      rebase -i: fix post-rewrite hook with failed exec command
      rebase -i: demonstrate incorrect behavior of post-rewrite
  15. @gitster

    Merge branch 'nd/diff-i-t-a'

    gitster authored
    * nd/diff-i-t-a:
      Revert "diff-lib.c: adjust position of i-t-a entries in diff"
  16. @chneukirchen @gitster

    cvsimport: silence regex warning appearing in Perl 5.22.

    chneukirchen authored gitster committed
    Since Perl 5.22, "A literal '{' should now be escaped in a pattern".
    Silence the recently added warning by using \{ instead.
    Signed-off-by: Christian Neukirchen <>
    Signed-off-by: Junio C Hamano <>
  17. @hashpling @gitster

    Fix definition of ARRAY_SIZE for non-gcc builds

    hashpling authored gitster committed
    The improved ARRAY_SIZE macro uses BARF_UNLESS_AN_ARRAY which expands
    to a valid check for recent gcc versions and to 0 for older gcc
    versions but is not defined on non-gcc builds.
    Non-gcc builds need this macro to expand to 0 as well. The current outer
    test (defined(__GNUC__) && (__GNUC__ >= 3)) is a strictly weaker
    condition than the inner test (GIT_GNUC_PREREQ(3, 1)) so we can omit the
    outer test and cause the BARF_UNLESS_AN_ARRAY macro to be defined
    correctly on non-gcc builds as well as gcc builds with older versions.
    Signed-off-by: Charles Bailey <>
    Signed-off-by: Junio C Hamano <>
Commits on Jun 24, 2015
  1. @gitster

    Ninth batch for 2.5

    gitster authored
    Signed-off-by: Junio C Hamano <>
  2. @gitster

    Merge branch 'jk/stash-require-clean-index'

    gitster authored
    A hotfix for the topic already in 'master'.
    * jk/stash-require-clean-index:
      Revert "stash: require a clean index to apply"
  3. @gitster

    Merge branch 'pa/auto-gc-mac-osx'

    gitster authored
    Recent Mac OS X updates breaks the logic to detect that the machine
    is on the AC power in the sample pre-auto-gc script.
    * pa/auto-gc-mac-osx:
      hooks/pre-auto-gc: adjust power checking for newer OS X
  4. @gitster

    Merge branch 'pt/t0302-needs-sanity'

    gitster authored
    * pt/t0302-needs-sanity:
      t0302: "unreadable" test needs SANITY prereq
  5. @gitster

    Merge branch 'ld/p4-changes-block-size'

    gitster authored
    More Perforce row number limit workaround for "git p4".
    * ld/p4-changes-block-size:
      git-p4: fixing --changes-block-size handling
      git-p4: add tests for non-numeric revision range
      git-p4: test with limited p4 server results
      git-p4: additional testing of --changes-block-size
  6. @gitster

    Merge branch 'fk/doc-format-patch-vn'

    gitster authored
    * fk/doc-format-patch-vn:
      doc: format-patch: fix typo
  7. @gitster

    Merge branch 'sg/commit-cleanup-scissors'

    gitster authored
    "git commit --cleanup=scissors" was not careful enough to protect
    against getting fooled by a line that looked like scissors.
    * sg/commit-cleanup-scissors:
      commit: cope with scissors lines in commit message
  8. @gitster

    Merge branch 'jk/index-pack-reduce-recheck'

    gitster authored
    Disable "have we lost a race with competing repack?" check while
    receiving a huge object transfer that runs index-pack.
    * jk/index-pack-reduce-recheck:
      index-pack: avoid excessive re-reading of pack directory
  9. @gitster

    Merge branch 'af/tcsh-completion-noclobber'

    gitster authored
    The tcsh completion writes a bash scriptlet but that would have
    failed for users with noclobber set.
    * af/tcsh-completion-noclobber:
      git-completion.tcsh: fix redirect with noclobber
  10. @gitster

    Merge branch 'mh/reporting-broken-refs-from-for-each-ref'

    gitster authored
    "git for-each-ref" reported "missing object" for 0{40} when it
    encounters a broken ref.  The lack of object whose name is 0{40} is
    not the problem; the ref being broken is.
    * mh/reporting-broken-refs-from-for-each-ref:
      read_loose_refs(): treat NULL_SHA1 loose references as broken
      read_loose_refs(): simplify function logic
      for-each-ref: report broken references correctly
      t6301: new tests of for-each-ref error handling
  11. @gitster

    Merge branch 'sg/completion-commit-cleanup'

    gitster authored
    * sg/completion-commit-cleanup:
      completion: teach 'scissors' mode to 'git commit --cleanup='
  12. @gitster

    Merge branch 'pt/am-abort-fix'

    gitster authored
    Various fixes around "git am" that applies a patch to a history
    that is not there yet.
    * pt/am-abort-fix:
      am --abort: keep unrelated commits on unborn branch
      am --abort: support aborting to unborn branch
      am --abort: revert changes introduced by failed 3way merge
      am --skip: support skipping while on unborn branch
      am -3: support 3way merge on unborn branch
      am --skip: revert changes introduced by failed 3way merge
  13. @gitster

    Merge branch 'nd/untracked-cache'

    gitster authored
    Hotfix for the 'untracked-cache' topic that is already in 'master'.
    * nd/untracked-cache:
      read-cache: fix untracked cache invalidation when split-index is used
  14. @gitster

    Merge branch 'mh/fsck-reflog-entries'

    gitster authored
    "git fsck" used to ignore missing or invalid objects recorded in reflog.
    * mh/fsck-reflog-entries:
      fsck: report errors if reflog entries point at invalid objects
      fsck_handle_reflog_sha1(): new function
  15. @gitster

    Merge branch 'js/sleep-without-select'

    gitster authored
    Portability fix.
    * js/sleep-without-select:
      lockfile: wait using sleep_millisec() instead of select()
      lockfile: convert retry timeout computations to millisecond
      help.c: wrap wait-only poll() invocation in sleep_millisec()
      lockfile: replace random() by rand()
  16. @gitster

    Merge branch 'es/utf8-stupid-compiler-workaround'

    gitster authored
    A compilation workaround.
    * es/utf8-stupid-compiler-workaround:
      utf8: NO_ICONV: silence uninitialized variable warning
  17. @gitster

    Merge branch 'rl/am-3way-config'

    gitster authored
    "git am" learned am.threeWay configuration variable.
    * rl/am-3way-config:
      git-am: add am.threeWay config variable
      t4150-am: refactor am -3 tests fix initialization of the threeway variable
Something went wrong with that request. Please try again.