Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
branch: next
Commits on Feb 25, 2015
  1. Junio C Hamano

    Sync with master

    gitster authored
    * master:
      Post 2.3 cyle (batch #5)
  2. Junio C Hamano

    Post 2.3 cyle (batch #5)

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

    Merge branch 'ak/git-pm-typofix'

    gitster authored
    Typofix in comments.
    
    * ak/git-pm-typofix:
      Git.pm: two minor typo fixes
  4. Junio C Hamano

    Merge branch 'sb/plug-leak-in-make-cache-entry'

    gitster authored
    "update-index --refresh" used to leak when an entry cannot be
    refreshed for whatever reason.
    
    * sb/plug-leak-in-make-cache-entry:
      read-cache.c: free cache entry when refreshing fails
  5. Junio C Hamano

    Merge branch 'mh/transport-capabilities'

    gitster authored
    The transport-helper did not give transport options such as
    verbosity, progress, cloning, etc. to import and export based
    helpers, like it did for fetch and push based helpers, robbing them
    the chance to honor the wish of the end-users better.
    
    * mh/transport-capabilities:
      transport-helper: ask the helper to set the same options for import as for fetch
      transport-helper: ask the helper to set progress and verbosity options after asking for its capabilities
  6. Junio C Hamano

    Merge branch 'jc/send-email-sensible-encoding'

    gitster authored
    "git send-email" used to accept a mistaken "y" (or "yes") as an
    answer to "What encoding do you want to use [UTF-8]? " without
    questioning.  Now it asks for confirmation when the answer looks
    too short to be a valid encoding name.
    
    * jc/send-email-sensible-encoding:
      send-email: ask confirmation if given encoding name is very short
  7. Junio C Hamano

    Merge branch 'jk/sanity'

    gitster authored
    The tests that wanted to see that file becomes unreadable after
    running "chmod a-r file", and the tests that wanted to make sure it
    is not run as root, we used "can we write into the / directory?" as
    a cheap substitute, but on some platforms that is not a good
    heuristics.  The tests and their prerequisites have been updated to
    check what they really require.
    
    * jk/sanity:
      test-lib.sh: set prerequisite SANITY by testing what we really need
      tests: correct misuses of POSIXPERM
      t/lib-httpd: switch SANITY check for NOT_ROOT
  8. Junio C Hamano

    Merge branch 'sb/hex-object-name-is-at-most-41-bytes-long'

    gitster authored
    Code clean-up.
    
    * sb/hex-object-name-is-at-most-41-bytes-long:
      hex.c: reduce memory footprint of sha1_to_hex static buffers
  9. Junio C Hamano

    Merge branch 'jk/fast-import-die-nicely-fix'

    gitster authored
    "git fast-import" used to crash when it could not close and
    conclude the resulting packfile cleanly.
    
    * jk/fast-import-die-nicely-fix:
      fast-import: avoid running end_packfile recursively
  10. Junio C Hamano

    Merge branch 'dp/remove-duplicated-header-inclusion'

    gitster authored
    Code clean-up.
    
    * dp/remove-duplicated-header-inclusion:
      do not include the same header twice
  11. Junio C Hamano

    Merge branch 'jc/max-io-size-and-ssize-max'

    gitster authored
    Our default I/O size (8 MiB) for large files was too large for some
    platforms with smaller SSIZE_MAX, leading to read(2)/write(2)
    failures.
    
    * jc/max-io-size-and-ssize-max:
      xread/xwrite: clip MAX_IO_SIZE to SSIZE_MAX
  12. Junio C Hamano

    Merge branch 'tc/missing-http-proxyauth'

    gitster authored
    We did not check the curl library version before using
    CURLOPT_PROXYAUTH feature that may not exist.
    
    * tc/missing-http-proxyauth:
      http: support curl < 7.10.7
  13. Junio C Hamano

    Merge branch 'jk/strbuf-doc-to-header'

    gitster authored
    The strbuf API was explained between the API documentation and in
    the header file.  Move missing bits to strbuf.h so that programmers
    can check only one place for all necessary information.
    
    * jk/strbuf-doc-to-header:
      strbuf.h: group documentation for trim functions
      strbuf.h: drop boilerplate descriptions of strbuf_split_*
      strbuf.h: reorganize api function grouping headers
      strbuf.h: format asciidoc code blocks as 4-space indent
      strbuf.h: drop asciidoc list formatting from API docs
      strbuf.h: unify documentation comments beginnings
      strbuf.h: integrate api-strbuf.txt documentation
  14. Junio C Hamano

    Merge branch 'nd/attr-optim'

    gitster authored
    Optimize attribute look-up, mostly useful in "git grep" on a
    project that does not use many attributes, by avoiding it when we
    (should) know that the attributes are not defined in the first
    place.
    
    * nd/attr-optim:
      attr: avoid heavy work when we know the specified attr is not defined
      attr: do not attempt to expand when we know it's not a macro
      attr.c: rename arg name attr_nr to avoid shadowing the global one
  15. Junio C Hamano

    Merge branch 'jn/doc-api-errors'

    gitster authored
    The error handling functions and conventions are now documented in
    the API manual.
    
    * jn/doc-api-errors:
      doc: document error handling functions and conventions
  16. Junio C Hamano

    Sync with master

    gitster authored
    * master:
      Git 2.3.1
  17. Junio C Hamano

    Merge branch 'tb/connect-ipv6-parse-fix' into next

    gitster authored
    We did not parse username followed by literal IPv6 address in SSH
    transport URLs, e.g. ssh://user@[2001:db8::1]:22/repo.git
    correctly.
    
    * tb/connect-ipv6-parse-fix:
      t5500: show user name and host in diag-url
      t5601: add more test cases for IPV6
      connect.c: allow ssh://user@[2001:db8::1]/repo.git
  18. Junio C Hamano

    Sync with 2.3.1

    gitster authored
  19. Junio C Hamano

    Git 2.3.1

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

    Merge branch 'ak/add-i-empty-candidates' into maint

    gitster authored
    The interactive "show a list and let the user choose from it"
    interface "add -i" used showed and prompted to the user even when
    the candidate list was empty, against which the only "choice" the
    user could have made was to choose nothing.
    
    * ak/add-i-empty-candidates:
      add -i: return from list_and_choose if there is no candidate
  21. Junio C Hamano

    Merge branch 'jc/apply-ws-fix-expands' into maint

    gitster authored
    "git apply --whitespace=fix" used to under-allocate the memory
    when the fix resulted in a longer text than the original patch.
    
    * jc/apply-ws-fix-expands:
      apply: count the size of postimage correctly
      apply: make update_pre_post_images() sanity check the given postlen
      apply.c: typofix
  22. Junio C Hamano

    Merge branch 'jc/doc-log-rev-list-options' into maint

    gitster authored
    "git log --help" used to show rev-list options that are irrelevant
    to the "log" command.
    
    * jc/doc-log-rev-list-options:
      Documentation: what does "git log --indexed-objects" even mean?
  23. Junio C Hamano

    Merge branch 'mg/commit-author-no-match-malformed-message' into maint

    gitster authored
    The error message from "git commit", when a non-existing author
    name was given as value to the "--author=" parameter, has been
    reworded to avoid misunderstanding.
    
    * mg/commit-author-no-match-malformed-message:
      commit: reword --author error message
  24. Junio C Hamano

    Merge branch 'jk/dumb-http-idx-fetch-fix' into maint

    gitster authored
    A broken pack .idx file in the receiving repository prevented the
    dumb http transport from fetching a good copy of it from the other
    side.
    
    * jk/dumb-http-idx-fetch-fix:
      dumb-http: do not pass NULL path to parse_pack_index
  25. Junio C Hamano

    Merge branch 'jc/diff-format-doc' into maint

    gitster authored
    The documentation incorrectly said that C(opy) and R(ename) are the
    only ones that can be followed by the score number in the output in
    the --raw format.
    
    * jc/diff-format-doc:
      diff-format doc: a score can follow M for rewrite
  26. Junio C Hamano

    Merge branch 'jk/remote-curl-an-array-in-struct-cannot-be-null' into …

    gitster authored
    …maint
    
    Fix a misspelled conditional that is always true.
    
    * jk/remote-curl-an-array-in-struct-cannot-be-null:
      do not check truth value of flex arrays
  27. Junio C Hamano

    Merge branch 'jk/status-read-branch-name-fix' into maint

    gitster authored
    Code to read branch name from various files in .git/ directory
    would have misbehaved if the code to write them left an empty file.
    
    * jk/status-read-branch-name-fix:
      read_and_strip_branch: fix typo'd address-of operator
  28. Junio C Hamano

    Merge branch 'mg/push-repo-option-doc' into maint

    gitster authored
    The "git push" documentation made the "--repo=<there>" option
    easily misunderstood.
    
    * mg/push-repo-option-doc:
      git-push.txt: document the behavior of --repo
  29. Junio C Hamano

    Merge branch 'bc/http-fallback-to-password-after-krb-fails' into maint

    gitster authored
    After attempting and failing a password-less authentication
    (e.g. kerberos), libcURL refuses to fall back to password based
    Basic authentication without a bit of help/encouragement.
    
    * bc/http-fallback-to-password-after-krb-fails:
      remote-curl: fall back to Basic auth if Negotiate fails
  30. Junio C Hamano

    Merge branch 'dk/format-patch-ignore-diff-submodule' into maint

    gitster authored
    Setting diff.submodule to 'log' made "git format-patch" produce
    broken patches.
    
    * dk/format-patch-ignore-diff-submodule:
      format-patch: ignore diff.submodule setting
      t4255: test am submodule with diff.submodule
  31. Junio C Hamano

    Merge branch 'jn/rerere-fail-on-auto-update-failure' into maint

    gitster authored
    "git rerere" (invoked internally from many mergy operations) did
    not correctly signal errors when told to update the working tree
    files and failed to do so for whatever reason.
    
    * jn/rerere-fail-on-auto-update-failure:
      rerere: error out on autoupdate failure
  32. Junio C Hamano

    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 23, 2015
  1. Junio C Hamano

    Merge branch 'rs/simple-cleanups' into next

    gitster authored
    * rs/simple-cleanups:
      sha1_name: use strlcpy() to copy strings
      pretty: use starts_with() to check for a prefix
      for-each-ref: use skip_prefix() to avoid duplicate string comparison
      connect: use strcmp() for string comparison
  2. Junio C Hamano

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

    gitster authored
    * rj/no-xopen-source-for-cygwin:
      git-compat-util.h: remove redundant code
  3. Junio C Hamano

    Merge branch 'mm/am-c-doc' into next

    gitster authored
    The configuration variable 'mailinfo.scissors' was hard to
    discover in the documentation.
    
    * mm/am-c-doc:
      Documentation/git-am.txt: mention mailinfo.scissors config variable
      Documentation/config.txt: document mailinfo.scissors
Something went wrong with that request. Please try again.