Skip to content

HTTPS clone URL

Subversion checkout URL

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

    Merge branch 'nd/untracked-cache'

    gitster authored
    * nd/untracked-cache:
      t7063: hide stderr from setup inside prereq
  2. @peff @gitster

    t7063: hide stderr from setup inside prereq

    peff authored gitster committed
    When t7063 starts, it runs "update-index --untracked-cache"
    to see if we support the untracked cache. Its output goes
    straight to stderr, even if the test is not run with "-v".
    Let's wrap it in a prereq that will hide the output by
    default, but show it with "-v".
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on May 26, 2015
  1. @gitster

    Sync with 2.4.2

    gitster authored
  2. @gitster

    Git 2.4.2

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

    Merge branch 'jk/still-interesting' into maint

    gitster authored
    "git rev-list --objects $old --not --all" to see if everything that
    is reachable from $old is already connected to the existing refs
    was very inefficient.
    
    * jk/still-interesting:
      limit_list: avoid quadratic behavior from still_interesting
  4. @gitster

    Merge branch 'jc/hash-object' into maint

    gitster authored
    "hash-object --literally" introduced in v2.2 was not prepared to
    take a really long object type name.
    
    * jc/hash-object:
      write_sha1_file(): do not use a separate sha1[] array
      t1007: add hash-object --literally tests
      hash-object --literally: fix buffer overrun with extra-long object type
      git-hash-object.txt: document --literally option
  5. @gitster

    Merge branch 'jk/rebase-quiet-noop' into maint

    gitster authored
    "git rebase --quiet" was not quite quiet when there is nothing to
    do.
    
    * jk/rebase-quiet-noop:
      rebase: silence "git checkout" for noop rebase
  6. @gitster

    Merge branch 'sg/complete-decorate-full-not-long' into maint

    gitster authored
    The completion for "log --decorate=" parameter value was incorrect.
    
    * sg/complete-decorate-full-not-long:
      completion: fix and update 'git log --decorate=' options
  7. @gitster

    Merge branch 'jk/filter-branch-use-of-sed-on-incomplete-line' into maint

    gitster authored
    "filter-branch" corrupted commit log message that ends with an
    incomplete line on platforms with some "sed" implementations that
    munge such a line.  Work it around by avoiding to use "sed".
    
    * jk/filter-branch-use-of-sed-on-incomplete-line:
      filter-branch: avoid passing commit message through sed
  8. @gitster

    Merge branch 'jc/daemon-no-ipv6-for-2.4.1' into maint

    gitster authored
    "git daemon" fails to build from the source under NO_IPV6
    configuration (regression in 2.4).
    
    * jc/daemon-no-ipv6-for-2.4.1:
      daemon: unbreak NO_IPV6 build regression
  9. @gitster

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

    gitster authored
    "git stash pop/apply" forgot to make sure that not just the working
    tree is clean but also the index is clean. The latter is important
    as a stash application can conflict and the index will be used for
    conflict resolution.
    
    * jk/stash-require-clean-index:
      stash: require a clean index to apply
      t3903: avoid applying onto dirty index
      t3903: stop hard-coding commit sha1s
  10. @gitster

    Merge branch 'jk/git-no-more-argv0-path-munging' into maint

    gitster authored
    We have prepended $GIT_EXEC_PATH and the path "git" is installed in
    (typically "/usr/bin") to $PATH when invoking subprograms and hooks
    for almost eternity, but the original use case the latter tried to
    support was semi-bogus (i.e. install git to /opt/foo/git and run it
    without having /opt/foo on $PATH), and more importantly it has
    become less and less relevant as Git grew more mainstream (i.e. the
    users would _want_ to have it on their $PATH).  Stop prepending the
    path in which "git" is installed to users' $PATH, as that would
    interfere the command search order people depend on (e.g. they may
    not like versions of programs that are unrelated to Git in /usr/bin
    and want to override them by having different ones in /usr/local/bin
    and have the latter directory earlier in their $PATH).
    
    * jk/git-no-more-argv0-path-munging:
      stop putting argv[0] dirname at front of PATH
  11. @gitster

    Fifth batch for 2.5 cycle

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

    Merge branch 'nd/untracked-cache'

    gitster authored
    Teach the index to optionally remember already seen untracked files
    to speed up "git status" in a working tree with tons of cruft.
    
    * nd/untracked-cache: (24 commits)
      git-status.txt: advertisement for untracked cache
      untracked cache: guard and disable on system changes
      mingw32: add uname()
      t7063: tests for untracked cache
      update-index: test the system before enabling untracked cache
      update-index: manually enable or disable untracked cache
      status: enable untracked cache
      untracked-cache: temporarily disable with $GIT_DISABLE_UNTRACKED_CACHE
      untracked cache: mark index dirty if untracked cache is updated
      untracked cache: print stats with $GIT_TRACE_UNTRACKED_STATS
      untracked cache: avoid racy timestamps
      read-cache.c: split racy stat test to a separate function
      untracked cache: invalidate at index addition or removal
      untracked cache: load from UNTR index extension
      untracked cache: save to an index extension
      ewah: add convenient wrapper ewah_serialize_strbuf()
      untracked cache: don't open non-existent .gitignore
      untracked cache: mark what dirs should be recursed/saved
      untracked cache: record/validate dir mtime and reuse cached output
      untracked cache: make a wrapper around {open,read,close}dir()
      ...
  13. @gitster

    Merge branch 'rs/plug-leak-in-pack-bitmaps'

    gitster authored
    The code to read pack-bitmap wanted to allocate a few hundred
    pointers to a structure, but by mistake allocated and leaked memory
    enough to hold that many actual structures.  Correct the allocation
    size and also have it on stack, as it is small enough.
    
    * rs/plug-leak-in-pack-bitmaps:
      pack-bitmaps: plug memory leak, fix allocation size for recent_bitmaps
  14. @gitster

    Merge branch 'pt/pull-ff-vs-merge-ff'

    gitster authored
    The pull.ff configuration was supposed to override the merge.ff
    configuration, but it didn't.
    
    * pt/pull-ff-vs-merge-ff:
      pull: parse pull.ff as a bool or string
      pull: make pull.ff=true override merge.ff
  15. @gitster

    Merge branch 'pt/pull-log-n'

    gitster authored
    "git pull --log" and "git pull --no-log" worked as expected, but
    "git pull --log=20" did not.
    
    * pt/pull-log-n:
      pull: handle --log=<n>
  16. @gitster

    Merge branch 'jk/rerere-forget-check-enabled'

    gitster authored
    "git rerere forget" in a repository without rerere enabled gave a
    cryptic error message; it should be a silent no-op instead.
    
    * jk/rerere-forget-check-enabled:
      rerere: exit silently on "forget" when rerere is disabled
Commits on May 22, 2015
  1. @gitster

    Fourth batch for 2.5 cycle

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

    Merge branch 'ps/doc-packfile-vs-pack-file'

    gitster authored
    Doc consistency updates.
    
    * ps/doc-packfile-vs-pack-file:
      doc: fix inconsistent spelling of "packfile"
      pack-protocol.txt: fix insconsistent spelling of "packfile"
      git-unpack-objects.txt: fix inconsistent spelling of "packfile"
      git-verify-pack.txt: fix inconsistent spelling of "packfile"
  3. @gitster

    Merge branch 'sb/t1020-cleanup'

    gitster authored
    There was a commented-out (instead of being marked to expect
    failure) test that documented a breakage that was fixed since the
    test was written; turn it into a proper test.
    
    * sb/t1020-cleanup:
      subdirectory tests: code cleanup, uncomment test
  4. @gitster

    Merge branch 'lm/squelch-bg-progress'

    gitster authored
    The controlling tty-based heuristics to squelch progress output did
    not consider that the process may not be talking to a tty at all
    (e.g. sending the progress to sideband #2).  This is a finishing
    touch to a topic that is already in 'master'.
    
    * lm/squelch-bg-progress:
      progress: treat "no terminal" as being in the foreground
  5. @gitster

    Merge branch 'jc/ignore-epipe-in-filter'

    gitster authored
    Filter scripts were run with SIGPIPE disabled on the Git side,
    expecting that they may not read what Git feeds them to filter.
    We however treated a filter that does not read its input fully
    before exiting as an error.
    
    This changes semantics, but arguably in a good way.  If a filter
    can produce its output without consuming its input using whatever
    magic, we now let it do so, instead of diagnosing it as a
    programming error.
    
    * jc/ignore-epipe-in-filter:
      filter_buffer_or_fd(): ignore EPIPE
      copy.c: make copy_fd() report its status silently
  6. @gitster

    Merge branch 'mh/clone-verbosity-fix'

    gitster authored
    Git 2.4 broke setting verbosity and progress levels on "git clone"
    with native transports.
    
    * mh/clone-verbosity-fix:
      clone: call transport_set_verbosity before anything else on the newly created transport
  7. @gitster

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

    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
  8. @gitster

    Merge branch 'mh/lockfile-retry'

    gitster authored
    Instead of dying immediately upon failing to obtain a lock, retry
    after a short while with backoff.
    
    * mh/lockfile-retry:
      lock_packed_refs(): allow retries when acquiring the packed-refs lock
      lockfile: allow file locking to be retried with a timeout
  9. @gitster

    Merge branch 'jk/add-e-kill-editor'

    gitster authored
    "git add -e" did not allow the user to abort the operation by
    killing the editor.
    
    * jk/add-e-kill-editor:
      add: check return value of launch_editor
  10. @gitster

    Merge branch 'sg/completion-config'

    gitster authored
    Code clean-up for completion script (in contrib/).
    
    * sg/completion-config:
      completion: simplify query for config variables
      completion: add a helper function to get config variables
  11. @gitster

    Merge branch 'mh/ref-directory-file'

    gitster authored
    The ref API did not handle cases where 'refs/heads/xyzzy/frotz' is
    removed at the same time as 'refs/heads/xyzzy' is added (or vice
    versa) very well.
    
    * mh/ref-directory-file:
      reflog_expire(): integrate lock_ref_sha1_basic() errors into ours
      ref_transaction_commit(): delete extra "the" from error message
      ref_transaction_commit(): provide better error messages
      rename_ref(): integrate lock_ref_sha1_basic() errors into ours
      lock_ref_sha1_basic(): improve diagnostics for ref D/F conflicts
      lock_ref_sha1_basic(): report errors via a "struct strbuf *err"
      verify_refname_available(): report errors via a "struct strbuf *err"
      verify_refname_available(): rename function
      refs: check for D/F conflicts among refs created in a transaction
      ref_transaction_commit(): use a string_list for detecting duplicates
      is_refname_available(): use dirname in first loop
      struct nonmatching_ref_data: store a refname instead of a ref_entry
      report_refname_conflict(): inline function
      entry_matches(): inline function
      is_refname_available(): convert local variable "dirname" to strbuf
      is_refname_available(): avoid shadowing "dir" variable
      is_refname_available(): revamp the comments
      t1404: new tests of ref D/F conflicts within transactions
  12. @gitster

    Merge branch 'mh/write-refs-sooner-2.4'

    gitster authored
    Multi-ref transaction support we merged a few releases ago
    unnecessarily kept many file descriptors open, risking to fail with
    resource exhaustion.  This is for 2.4.x track.
    
    * mh/write-refs-sooner-2.4:
      ref_transaction_commit(): fix atomicity and avoid fd exhaustion
      ref_transaction_commit(): remove the local flags variable
      ref_transaction_commit(): inline call to write_ref_sha1()
      rename_ref(): inline calls to write_ref_sha1() from this function
      commit_ref_update(): new function, extracted from write_ref_sha1()
      write_ref_to_lockfile(): new function, extracted from write_ref_sha1()
      t7004: rename ULIMIT test prerequisite to ULIMIT_STACK_SIZE
      update-ref: test handling large transactions properly
      ref_transaction_commit(): fix atomicity and avoid fd exhaustion
      ref_transaction_commit(): remove the local flags variable
      ref_transaction_commit(): inline call to write_ref_sha1()
      rename_ref(): inline calls to write_ref_sha1() from this function
      commit_ref_update(): new function, extracted from write_ref_sha1()
      write_ref_to_lockfile(): new function, extracted from write_ref_sha1()
      t7004: rename ULIMIT test prerequisite to ULIMIT_STACK_SIZE
      update-ref: test handling large transactions properly
  13. @gitster

    Merge branch 'mg/log-decorate-HEAD'

    gitster authored
    The "log --decorate" enhancement in Git 2.4 that shows the commit
    at the tip of the current branch e.g. "HEAD -> master", did not
    work with --decorate=full.
    
    * mg/log-decorate-HEAD:
      log: do not shorten decoration names too early
      log: decorate HEAD with branch name under --decorate=full, too
  14. @gitster

    Merge branch 'jk/asciidoc-markup-fix'

    gitster authored
    Various documentation mark-up fixes to make the output more
    consistent in general and also make AsciiDoctor (an alternative
    formatter) happier.
    
    * jk/asciidoc-markup-fix:
      doc: convert AsciiDoc {?foo} to ifdef::foo[]
      doc: put example URLs and emails inside literal backticks
      doc: drop backslash quoting of some curly braces
      doc: convert \--option to --option
      doc/add: reformat `--edit` option
      doc: fix length of underlined section-title
      doc: fix hanging "+"-continuation
      doc: fix unquoted use of "{type}"
      doc: fix misrendering due to `single quote'
  15. @gitster

    Merge branch 'jk/stripspace-asciidoctor-fix'

    gitster authored
    A literal block in the tutorial had lines with unequal lengths to
    delimit it from the rest of the document, which choke GitHub's
    AsciiDoc renderer.
    
    * jk/stripspace-asciidoctor-fix:
      doc: fix unmatched code fences in git-stripspace
  16. @gitster

    Merge branch 'ja/tutorial-asciidoctor-fix'

    gitster authored
    A literal block in the tutorial had lines with unequal lengths to
    delimit it from the rest of the document, which choke GitHub's
    AsciiDoc renderer.
    
    * ja/tutorial-asciidoctor-fix:
      doc: fix unmatched code fences
  17. @gitster

    Merge branch 'sg/help-subcommands'

    gitster authored
    A preparatory clean-up step.
    
    * sg/help-subcommands:
      command-list.txt: fix whitespace inconsistency
Something went wrong with that request. Please try again.