Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on Mar 20, 2015
  1. @gitster

    Merge branch 'km/bsd-sysctl'

    gitster authored
    We now detect number of CPUs on older BSD-derived systems.
    
    * km/bsd-sysctl:
      thread-utils.c: detect CPU count on older BSD-like systems
      configure: support HAVE_BSD_SYSCTL option
  2. @gitster

    Merge branch 'km/bsd-shells'

    gitster authored
    Portability fixes and workarounds for shell scripts have been added
    to help BSD-derived systems.
    
    * km/bsd-shells:
      t5528: do not fail with FreeBSD shell
      help.c: use SHELL_PATH instead of hard-coded "/bin/sh"
      git-compat-util.h: move SHELL_PATH default into header
      git-instaweb: use @SHELL_PATH@ instead of /bin/sh
      git-instaweb: allow running in a working tree subdirectory
Commits on Mar 6, 2015
  1. @gitster

    Merge branch 'bw/kwset-use-unsigned'

    gitster authored
    The borrowed code in kwset API did not follow our usual convention
    to use "unsigned char" to store values that range from 0-255.
    
    * bw/kwset-use-unsigned:
      kwset: use unsigned char to store values with high-bit set
  2. @gitster

    Merge branch 'rj/no-xopen-source-for-cygwin' into maint

    gitster authored
    Code cleanups.
    
    * rj/no-xopen-source-for-cygwin:
      git-compat-util.h: remove redundant code
Commits on Mar 5, 2015
  1. @gitster

    Merge branch 'es/squelch-openssl-warnings-on-macosx' into maint

    gitster authored
    An earlier workaround to squelch unhelpful deprecation warnings
    from the complier on Mac OSX unnecessarily set minimum required
    version of the OS, which the user might want to raise (or lower)
    for other reasons.
    
    * es/squelch-openssl-warnings-on-macosx:
      git-compat-util: do not step on MAC_OS_X_VERSION_MIN_REQUIRED
  2. @gitster

    Merge branch 'rj/no-xopen-source-for-cygwin'

    gitster authored
    Code cleanups.
    
    * rj/no-xopen-source-for-cygwin:
      git-compat-util.h: remove redundant code
Commits on Feb 25, 2015
  1. @gitster

    Merge branch 'jk/blame-commit-label' into maint

    gitster authored
    "git blame HEAD -- missing" failed to correctly say "HEAD" when it
    tried to say "No such path 'missing' in HEAD".
    
    * jk/blame-commit-label:
      blame.c: fix garbled error message
      use xstrdup_or_null to replace ternary conditionals
      builtin/commit.c: use xstrdup_or_null instead of envdup
      builtin/apply.c: use xstrdup_or_null instead of null_strdup
      git-compat-util: add xstrdup_or_null helper
Commits on Feb 22, 2015
  1. @gitster

    Merge branch 'es/squelch-openssl-warnings-on-macosx'

    gitster authored
    An earlier workaround to squelch unhelpful deprecation warnings
    from the complier on Mac OSX unnecessarily set minimum required
    version of the OS, which the user might want to raise (or lower)
    for other reasons.
    
    * es/squelch-openssl-warnings-on-macosx:
      git-compat-util: do not step on MAC_OS_X_VERSION_MIN_REQUIRED
Commits on Feb 11, 2015
  1. @gitster

    Merge branch 'km/gettext-n'

    gitster authored
    * km/gettext-n:
      gettext.h: add parentheses around N_ expansion if supported
  2. @gitster

    Merge branch 'jk/blame-commit-label'

    gitster authored
    "git blame HEAD -- missing" failed to correctly say "HEAD" when it
    tried to say "No such path 'missing' in HEAD".
    
    * jk/blame-commit-label:
      blame.c: fix garbled error message
      use xstrdup_or_null to replace ternary conditionals
      builtin/commit.c: use xstrdup_or_null instead of envdup
      builtin/apply.c: use xstrdup_or_null instead of null_strdup
      git-compat-util: add xstrdup_or_null helper
Commits on Jan 14, 2015
  1. @gitster

    Merge branch 'rh/autoconf-rhel3'

    gitster authored
    Build update for older RHEL.
    
    * rh/autoconf-rhel3:
      configure.ac: check for HMAC_CTX_cleanup
      configure.ac: check for clock_gettime and CLOCK_MONOTONIC
      configure.ac: check 'tv_nsec' field in 'struct stat'
Commits on Jan 7, 2015
  1. @gitster

    Merge branch 'es/squelch-openssl-warnings-on-macosx'

    gitster authored
    Squelch useless compiler warnings on Mac OS X.
    
    * es/squelch-openssl-warnings-on-macosx:
      git-compat-util: suppress unavoidable Apple-specific deprecation warnings
Commits on Dec 22, 2014
  1. @gitster

    Merge branch 'dm/compat-s-ifmt-for-zos'

    gitster authored
    Long overdue departure from the assumption that S_IFMT is shared by
    everybody made in 2005.
    
    * dm/compat-s-ifmt-for-zos:
      compat: convert modes to use portable file type values
  2. @gitster

    Merge branch 'rj/no-xopen-source-for-cygwin'

    gitster authored
    Avoid compilation warnings on recent gcc toolchain on Cygwin.
    
    * rj/no-xopen-source-for-cygwin:
      git-compat-util.h: don't define _XOPEN_SOURCE on cygwin
Commits on Oct 29, 2014
  1. @gitster

    Merge branch 'dm/port2zos'

    gitster authored
    z/OS port
    
    * dm/port2zos:
      compat/bswap.h: detect endianness from XL C compiler macros
      Makefile: reorder linker flags in the git executable rule
      git-compat-util.h: support variadic macros with the XL C compiler
  2. @gitster

    Merge branch 'jk/prune-mtime'

    gitster authored
    Tighten the logic to decide that an unreachable cruft is
    sufficiently old by covering corner cases such as an ancient object
    becoming reachable and then going unreachable again, in which case
    its retention period should be prolonged.
    
    * jk/prune-mtime: (28 commits)
      drop add_object_array_with_mode
      revision: remove definition of unused 'add_object' function
      pack-objects: double-check options before discarding objects
      repack: pack objects mentioned by the index
      pack-objects: use argv_array
      reachable: use revision machinery's --indexed-objects code
      rev-list: add --indexed-objects option
      rev-list: document --reflog option
      t5516: test pushing a tag of an otherwise unreferenced blob
      traverse_commit_list: support pending blobs/trees with paths
      make add_object_array_with_context interface more sane
      write_sha1_file: freshen existing objects
      pack-objects: match prune logic for discarding objects
      pack-objects: refactor unpack-unreachable expiration check
      prune: keep objects reachable from recent objects
      sha1_file: add for_each iterators for loose and packed objects
      count-objects: use for_each_loose_file_in_objdir
      count-objects: do not use xsize_t when counting object size
      prune-packed: use for_each_loose_file_in_objdir
      reachable: mark index blobs as SEEN
      ...
Commits on Oct 24, 2014
  1. @gitster

    Merge branch 'eb/no-pthreads'

    gitster authored
    Allow us build with NO_PTHREADS=NoThanks compilation option.
    
    * eb/no-pthreads:
      Handle atexit list internaly for unthreaded builds
      pack-objects: set number of threads before checking and warning
      index-pack: fix compilation with NO_PTHREADS
Commits on Sep 30, 2014
  1. @gitster

    Merge branch 'jt/itimer-autoconf'

    gitster authored
    setitmer(2) and related API elements can be configured from
    Makefile but autoconf did not know about it.
    
    * jt/itimer-autoconf:
      autoconf: check for setitimer()
      autoconf: check for struct itimerval
      git-compat-util.h: add missing semicolon after struct itimerval
Commits on Sep 26, 2014
  1. @gitster

    Merge branch 'rs/realloc-array'

    gitster authored
    Code cleanup.
    
    * rs/realloc-array:
      use REALLOC_ARRAY for changing the allocation size of arrays
      add macro REALLOC_ARRAY
Commits on Sep 19, 2014
  1. @gitster

    Merge branch 'ss/compat-default-source-for-newer-gnu'

    gitster authored
    * ss/compat-default-source-for-newer-gnu:
      compat-util: add _DEFAULT_SOURCE define
Commits on Sep 11, 2014
  1. @gitster

    Merge branch 'nd/large-blobs'

    gitster authored
    Teach a few codepaths to punt (instead of dying) when large blobs
    that would not fit in core are involved in the operation.
    
    * nd/large-blobs:
      diff: shortcut for diff'ing two binary SHA-1 objects
      diff --stat: mark any file larger than core.bigfilethreshold binary
      diff.c: allow to pass more flags to diff_populate_filespec
      sha1_file.c: do not die failing to malloc in unpack_compressed_entry
      wrapper.c: introduce gentle xmallocz that does not die()
Commits on Sep 9, 2014
  1. @gitster

    Merge branch 'rs/inline-compat-path-macros'

    gitster authored
    * rs/inline-compat-path-macros:
      turn path macros into inline function
Commits on Sep 2, 2014
  1. @gitster

    Merge branch 'rs/strbuf-getcwd'

    gitster authored
    Reduce the use of fixed sized buffer passed to getcwd() calls
    by introducing xgetcwd() helper.
    
    * rs/strbuf-getcwd:
      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()
Commits on Jul 28, 2014
  1. @gitster

    Revert "Merge branch 'dt/refs-check-refname-component-sse'"

    gitster authored
    This reverts commit 6f92e5f, reversing
    changes made to a02ad88.
Commits on Jul 22, 2014
  1. @gitster

    Merge branch 'kb/perf-trace'

    gitster authored
    * kb/perf-trace:
      api-trace.txt: add trace API documentation
      progress: simplify performance measurement by using getnanotime()
      wt-status: simplify performance measurement by using getnanotime()
      git: add performance tracing for git's main() function to debug scripts
      trace: add trace_performance facility to debug performance issues
      trace: add high resolution timer function to debug performance issues
      trace: add 'file:line' to all trace output
      trace: move code around, in preparation to file:line output
      trace: add current timestamp to all trace output
      trace: disable additional trace output for unit tests
      trace: add infrastructure to augment trace output with additional info
      sha1_file: change GIT_TRACE_PACK_ACCESS logging to use trace API
      Documentation/git.txt: improve documentation of 'GIT_TRACE*' variables
      trace: improve trace performance
      trace: remove redundant printf format attribute
      trace: consistently name the format parameter
      trace: move trace declarations from cache.h to new trace.h
Commits on Jul 21, 2014
  1. @gitster

    Merge branch 'ak/profile-feedback-build'

    gitster authored
    * ak/profile-feedback-build:
      Fix profile feedback with -jN and add profile-fast
      Run the perf test suite for profile feedback too
      Don't define away __attribute__ on gcc
      Use BASIC_FLAGS for profile feedback
Commits on Jul 16, 2014
  1. @gitster

    Merge branch 'jk/strip-suffix'

    gitster authored
    * jk/strip-suffix:
      prepare_packed_git_one: refactor duplicate-pack check
      verify-pack: use strbuf_strip_suffix
      strbuf: implement strbuf_strip_suffix
      index-pack: use strip_suffix to avoid magic numbers
      use strip_suffix instead of ends_with in simple cases
      replace has_extension with ends_with
      implement ends_with via strip_suffix
      add strip_suffix function
      sha1_file: replace PATH_MAX buffer with strbuf in prepare_packed_git_one()
Commits on Jul 9, 2014
  1. @gitster

    Merge branch 'jk/skip-prefix'

    gitster authored
    * jk/skip-prefix:
      http-push: refactor parsing of remote object names
      imap-send: use skip_prefix instead of using magic numbers
      use skip_prefix to avoid repeated calculations
      git: avoid magic number with skip_prefix
      fetch-pack: refactor parsing in get_ack
      fast-import: refactor parsing of spaces
      stat_opt: check extra strlen call
      daemon: use skip_prefix to avoid magic numbers
      fast-import: use skip_prefix for parsing input
      use skip_prefix to avoid repeating strings
      use skip_prefix to avoid magic numbers
      transport-helper: avoid reading past end-of-string
      fast-import: fix read of uninitialized argv memory
      apply: use skip_prefix instead of raw addition
      refactor skip_prefix to return a boolean
      avoid using skip_prefix as a boolean
      daemon: mark some strings as const
      parse_diff_color_slot: drop ofs parameter
Commits on Jul 2, 2014
  1. @gitster

    Merge branch 'dt/refs-check-refname-component-sse'

    gitster authored
    Further micro-optimization of a leaf-function.
    
    * dt/refs-check-refname-component-sse:
      refs.c: SSE2 optimizations for check_refname_component
Commits on Jun 25, 2014
  1. @gitster

    Merge branch 'ym/fix-opportunistic-index-update-race' into maint

    gitster authored
    "git status", even though it is a read-only operation, tries to
    update the index with refreshed lstat(2) info to optimize future
    accesses to the working tree opportunistically, but this could
    race with a "read-write" operation that modify the index while it
    is running.  Detect such a race and avoid overwriting the index.
    
    * ym/fix-opportunistic-index-update-race:
      read-cache.c: verify index file before we opportunistically update it
      wrapper.c: add xpread() similar to xread()
Commits on Jun 16, 2014
  1. @gitster

    Merge branch 'sk/windows-unc-path'

    gitster authored
    * sk/windows-unc-path:
      Windows: allow using UNC path for git repository
Commits on Jun 6, 2014
  1. @gitster

    Merge branch 'jk/squelch-compiler-warning-from-funny-error-macro'

    gitster authored
    * jk/squelch-compiler-warning-from-funny-error-macro:
      let clang use the constant-return error() macro
      inline constant return from error() function
Commits on Jun 3, 2014
  1. @gitster

    Merge branch 'ym/fix-opportunistic-index-update-race'

    gitster authored
    Read-only operations such as "git status" that internally refreshes
    the index write out the refreshed index to the disk to optimize
    future accesses to the working tree, but this could race with a
    "read-write" operation that modify the index while it is running.
    Detect such a race and avoid overwriting the index.
    
    Duy raised a good point that we may need to do the same for the
    normal writeout codepath, not just the "opportunistic" update
    codepath.  While that is true, nobody sane would be running two
    simultaneous operations that are clearly write-oriented competing
    with each other against the same index file.  So in that sense that
    can be done as a less urgent follow-up for this topic.
    
    * ym/fix-opportunistic-index-update-race:
      read-cache.c: verify index file before we opportunistically update it
      wrapper.c: add xpread() similar to xread()
  2. @gitster

    Merge branch 'ks/tree-diff-nway'

    gitster authored
    Instead of running N pair-wise diff-trees when inspecting a
    N-parent merge, find the set of paths that were touched by walking
    N+1 trees in parallel.  These set of paths can then be turned into
    N pair-wise diff-tree results to be processed through rename
    detections and such.  And N=2 case nicely degenerates to the usual
    2-way diff-tree, which is very nice.
    
    * ks/tree-diff-nway:
      mingw: activate alloca
      combine-diff: speed it up, by using multiparent diff tree-walker directly
      tree-diff: rework diff_tree() to generate diffs for multiparent cases as well
      Portable alloca for Git
      tree-diff: reuse base str(buf) memory on sub-tree recursion
      tree-diff: no need to call "full" diff_tree_sha1 from show_path()
      tree-diff: rework diff_tree interface to be sha1 based
      tree-diff: diff_tree() should now be static
      tree-diff: remove special-case diff-emitting code for empty-tree cases
      tree-diff: simplify tree_entry_pathcmp
      tree-diff: show_path prototype is not needed anymore
      tree-diff: rename compare_tree_entry -> tree_entry_pathcmp
      tree-diff: move all action-taking code out of compare_tree_entry()
      tree-diff: don't assume compare_tree_entry() returns -1,0,1
      tree-diff: consolidate code for emitting diffs and recursion in one place
      tree-diff: show_tree() is not needed
      tree-diff: no need to pass match to skip_uninteresting()
      tree-diff: no need to manually verify that there is no mode change for a path
      combine-diff: move changed-paths scanning logic into its own function
      combine-diff: move show_log_first logic/action out of paths scanning
Commits on Apr 9, 2014
  1. @gitster

    Merge branch 'jk/commit-dates-parsing-fix' into maint

    gitster authored
    * jk/commit-dates-parsing-fix:
      t4212: loosen far-in-future test for AIX
      date: recognize bogus FreeBSD gmtime output
Something went wrong with that request. Please try again.