Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on Jul 1, 2015
  1. @gitster

    Sync with 2.5-rc1

    gitster authored
    * master:
      Git 2.5.0-rc1
  2. @gitster

    Git 2.5.0-rc1

    gitster authored
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. @gitster

    Merge branch 'me/fetch-into-shallow-safety'

    gitster authored
    "git fetch --depth=<depth>" and "git clone --depth=<depth>" issued
    a shallow transfer request even to an upload-pack that does not
    support the capability.
    
    * me/fetch-into-shallow-safety:
      fetch-pack: check for shallow if depth given
  4. @gitster

    Merge branch 'jc/prompt-document-ps1-state-separator'

    gitster authored
    Docfix.
    
    * jc/prompt-document-ps1-state-separator:
      git-prompt.sh: document GIT_PS1_STATESEPARATOR
  5. @gitster

    Merge branch 'mm/describe-doc'

    gitster authored
    Docfix.
    
    * mm/describe-doc:
      Documentation/describe: improve one-line summary
  6. @gitster

    Merge branch 'da/mergetool-winmerge'

    gitster authored
    Hotfix for an earlier change already in 'master' that broke the
    default tool selection for mergetool.
    
    * da/mergetool-winmerge:
      mergetool-lib: fix default tool selection
Commits on Jun 29, 2015
  1. @gitster

    Merge branch 'ee/clean-remove-dirs' into next

    gitster authored
    * ee/clean-remove-dirs:
      read_gitfile_gently: fix use-after-free
  2. @gitster

    Merge branch 'nd/multiple-work-trees' into next

    gitster authored
    Hotfix to remove 'worktree pruning' out of 'git prune'.
    
    * nd/multiple-work-trees:
      worktree: new place for "git prune --worktrees"
  3. @pclouds @gitster

    worktree: new place for "git prune --worktrees"

    pclouds authored gitster committed
    Commit 23af91d (prune: strategies for linked checkouts - 2014-11-30)
    adds "--worktrees" to "git prune" without realizing that "git prune" is
    for object database only. This patch moves the same functionality to a
    new command "git worktree".
    
    Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Commits on Jun 28, 2015
  1. @gitster

    Sync with master

    gitster authored
    * master:
  2. @gitster

    Sync with maint

    gitster authored
    * maint:
Commits on Jun 26, 2015
  1. @peff @gitster

    read_gitfile_gently: fix use-after-free

    peff authored gitster committed
    The "dir" variable is a pointer into the "buf" array. When
    we hit the cleanup_return path, the first thing we do is
    free(buf); but one of the error messages prints "dir", which
    will access the memory after the free.
    
    We can fix this by reorganizing the error path a little. We
    act on the fatal, error-printing conditions first, as they
    want to access memory and do not care about freeing. Then we
    free any memory, and finally return.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @gitster

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

    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 'cb/array-size' into maint

    gitster authored
    * cb/array-size:
      Fix definition of ARRAY_SIZE for non-gcc builds
Commits on Jun 25, 2015
  1. @gitster

    Sync with v2.5.0-rc0

    gitster authored
    * master:
      Git 2.5.0-rc0
      Git 2.4.5
      cvsimport: silence regex warning appearing in Perl 5.22.
      Fix definition of ARRAY_SIZE for non-gcc builds
      Revert "diff-lib.c: adjust position of i-t-a entries in diff"
  2. @gitster

    Git 2.5.0-rc0

    gitster authored
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. @gitster

    Merge branch 'cn/cvsimport-perl-update'

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

    Merge branch 'cb/array-size'

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

    Sync with 2.4.5

    gitster authored
  6. @gitster

    Git 2.4.5

    gitster authored
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  7. @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
  8. @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
  9. @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
  10. @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
  11. @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
  12. @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"
  13. @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
  14. @gitster

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

    gitster authored
    …aint
    
    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}
  15. @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
  16. @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"
  17. @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 <chneukirchen@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  18. @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 <cbailey32@bloomberg.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jun 24, 2015
  1. @gitster

    Sync with master

    gitster authored
    * master:
      Ninth batch for 2.5
  2. @gitster

    Merge branch 'ee/clean-remove-dirs' into next

    gitster authored
    Replace "is this subdirectory a separate repository that should not
    be touched?" check "git clean" does by checking if it has .git/HEAD
    using the submodule-related code with a more optimized check.
    
    * ee/clean-remove-dirs:
      clean: improve performance when removing lots of directories
      p7300: add performance tests for clean
      t7300: add tests to document behavior of clean and nested git
      setup: sanity check file size in read_gitfile_gently
      setup: add gentle version of read_gitfile
  3. @gitster

    Merge branch 'mh/replace-refs' into next

    gitster authored
    Add an environment variable to tell Git to look into refs hierarchy
    other than refs/replace/ for the object replacement data.
    
    * mh/replace-refs:
      Allow to control where the replace refs are looked for
Something went wrong with that request. Please try again.