Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
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
  18. @gitster

    Merge branch 'ps/bundle-verify-arg'

    gitster authored
    "git bundle verify" did not diagnose extra parameters on the
    command line.
    
    * ps/bundle-verify-arg:
      bundle: verify arguments more strictly
  19. @gitster

    Merge branch 'ls/http-ssl-cipher-list'

    gitster authored
    Introduce http.<url>.SSLCipherList configuration variable to tweak
    the list of cipher suite to be used with libcURL when talking with
    https:// sites.
    
    * ls/http-ssl-cipher-list:
      http: add support for specifying an SSL cipher list
  20. @gitster

    Merge branch 'dl/subtree-avoid-tricky-echo'

    gitster authored
    "git subtree" script (in contrib/) used "echo -n" to produce
    progress messages in a non-portable way.
    
    * dl/subtree-avoid-tricky-echo:
      contrib/subtree: portability fix for string printing
  21. @gitster

    Merge branch 'jk/skip-http-tests-under-no-curl'

    gitster authored
    Test clean-up.
    
    * jk/skip-http-tests-under-no-curl:
      tests: skip dav http-push tests under NO_EXPAT=NoThanks
      t/lib-httpd.sh: skip tests if NO_CURL is defined
  22. @gitster

    Merge branch 'dl/subtree-push-no-squash'

    gitster authored
    "git subtree" script (in contrib/) does not have --squash option
    when pushing, but the documentation and help text pretended as if
    it did.
    
    * dl/subtree-push-no-squash:
      contrib/subtree: there's no push --squash
  23. @gitster

    Merge branch 'sg/completion-omit-credential-helpers'

    gitster authored
    The Git subcommand completion (in contrib/) listed credential
    helpers among candidates, which is not something the end user would
    invoke interatively.
    
    * sg/completion-omit-credential-helpers:
      completion: remove credential helpers from porcelain commands
  24. @gitster

    Merge branch 'dl/branch-error-message'

    gitster authored
    Error messages from "git branch" called remote-tracking branches as
    "remote branches".
    
    * dl/branch-error-message:
      branch: do not call a "remote-tracking branch" a "remote branch"
  25. @pks-t @gitster

    doc: fix inconsistent spelling of "packfile"

    pks-t authored gitster committed
    Fix remaining instances where "pack-file" is used instead of
    "packfile". Some places remain where we still use "pack-file",
    This is the case when we explicitly refer to a file with a
    ".pack" extension as opposed to a data source providing a pack
    data stream.
    
    Signed-off-by: Patrick Steinhardt <ps@pks.im>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on May 20, 2015
  1. @gitster

    filter_buffer_or_fd(): ignore EPIPE

    gitster authored
    We are explicitly ignoring SIGPIPE, as we fully expect that the
    filter program may not read our output fully.  Ignore EPIPE that
    may come from writing to it as well.
    
    A new test was stolen from Jeff's suggestion.
    
    Helped-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on May 19, 2015
  1. @gitster

    copy.c: make copy_fd() report its status silently

    gitster authored
    When copy_fd() function encounters errors, it emits error messages
    itself, which makes it impossible for callers to take responsibility
    for reporting errors, especially when they want to ignore certain
    errors.
    
    Move the error reporting to its callers in preparation.
    
     - copy_file() and copy_file_with_time() by indirection get their
       own calls to error().
    
     - hold_lock_file_for_append(), when told to die on error, used to
       exit(128) relying on the error message from copy_fd(), but now it
       does its own die() instead.  Note that the callers that do not
       pass LOCK_DIE_ON_ERROR need to be adjusted for this change, but
       fortunately there is none ;-)
    
     - filter_buffer_or_fd() has its own error() already, in addition to
       the message from copy_fd(), so this will change the output but
       arguably in a better way.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @gitster

    Third batch for 2.5 cycle

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

    Merge branch 'sb/ref-lock-lose-lock-fd'

    gitster authored
    The refs API uses ref_lock struct which had its own "int fd", even
    though the same file descriptor was in the lock struct it contains.
    Clean-up the code to lose this redundant field.
    
    * sb/ref-lock-lose-lock-fd:
      refs.c: remove lock_fd from struct ref_lock
  4. @gitster

    Merge branch 'kn/cat-file-literally'

    gitster authored
    Add the "--allow-unknown-type" option to "cat-file" to allow
    inspecting loose objects of an experimental or a broken type.
    
    * kn/cat-file-literally:
      t1006: add tests for git cat-file --allow-unknown-type
      cat-file: teach cat-file a '--allow-unknown-type' option
      cat-file: make the options mutually exclusive
      sha1_file: support reading from a loose object of unknown type
  5. @gitster

    Merge branch 'nd/dwim-wildcards-as-pathspecs'

    gitster authored
    A heuristic to help the "git <cmd> <revs> <pathspec>" command line
    convention to catch mistyped paths is to make sure all the non-rev
    parameters in the later part of the command line are names of the
    files in the working tree, but that means "git grep $str -- \*.c"
    must always be disambiguated with "--", because nobody sane will
    create a file whose name literally is asterisk-dot-see.  Loosen the
    heuristic to declare that with a wildcard string the user likely
    meant to give us a pathspec.
    
    * nd/dwim-wildcards-as-pathspecs:
      pathspec: avoid the need of "--" when wildcard is used
  6. @gitster

    Merge branch 'jc/merge'

    gitster authored
    "git merge FETCH_HEAD" learned that the previous "git fetch" could
    be to create an Octopus merge, i.e. recording multiple branches
    that are not marked as "not-for-merge"; this allows us to lose an
    old style invocation "git merge <msg> HEAD $commits..." in the
    implementation of "git pull" script; the old style syntax can now
    be deprecated.
    
    * jc/merge:
      merge: deprecate 'git merge <message> HEAD <commit>' syntax
      merge: handle FETCH_HEAD internally
      merge: decide if we auto-generate the message early in collect_parents()
      merge: make collect_parents() auto-generate the merge message
      merge: extract prepare_merge_message() logic out
      merge: narrow scope of merge_names
      merge: split reduce_parents() out of collect_parents()
      merge: clarify collect_parents() logic
      merge: small leakfix and code simplification
      merge: do not check argc to determine number of remote heads
      merge: clarify "pulling into void" special case
      t5520: test pulling an octopus into an unborn branch
      t5520: style fixes
      merge: simplify code flow
      merge: test the top-level merge driver
  7. @gitster

    Merge branch 'ph/rebase-i-redo'

    gitster authored
    "git rebase -i" moved the "current" command from "todo" to "done" a
    bit too prematurely, losing a step when a "pick" did not even start.
    
    * ph/rebase-i-redo:
      rebase -i: redo tasks that die during cherry-pick
  8. @gitster

    Merge branch 'jc/test-prereq-validate'

    gitster authored
    Help us to find broken test script that splits the body part of the
    test by mistaken use of wrong kind of quotes.
    
    * jc/test-prereq-validate:
      test: validate prerequistes syntax
  9. @gitster

    Merge branch 'bc/connect-plink'

    gitster authored
    The connection initiation code for "ssh" transport tried to absorb
    differences between the stock "ssh" and Putty-supplied "plink" and
    its derivatives, but the logic to tell that we are using "plink"
    variants were too loose and falsely triggered when "plink" appeared
    anywhere in the path (e.g. "/home/me/bin/uplink/ssh").
    
    * bc/connect-plink:
      connect: improve check for plink to reduce false positives
      t5601: fix quotation error leading to skipped tests
      connect: simplify SSH connection code path
Something went wrong with that request. Please try again.