Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
branch: master
Commits on Feb 18, 2015
  1. Junio C Hamano

    Post 2.3 cycle (batch #3)

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

    Merge branch 'jc/push-cert'

    gitster authored
    "git push --signed" gave an incorrectly worded error message when
    the other side did not support the capability.
    
    * jc/push-cert:
      transport-helper: fix typo in error message when --signed is not supported
  3. Junio C Hamano

    Merge branch 'jk/decimal-width-for-uintmax'

    gitster authored
    We didn't format an integer that wouldn't fit in "int" but in
    "uintmax_t" correctly.
    
    * jk/decimal-width-for-uintmax:
      decimal_width: avoid integer overflow
  4. Junio C Hamano

    Merge branch 'jk/config-no-ungetc-eof'

    gitster authored
    Reading configuration from a blob object, when it ends with a lone
    CR, use to confuse the configuration parser.
    
    * jk/config-no-ungetc-eof:
      config_buf_ungetc: warn when pushing back a random character
      config: do not ungetc EOF
  5. Junio C Hamano

    Merge branch 'jk/pack-bitmap'

    gitster authored
    The pack bitmap support did not build with older versions of GCC.
    
    * jk/pack-bitmap:
      ewah: fix building with gcc < 3.4.0
  6. Junio C Hamano

    Merge branch 'jc/remote-set-url-doc'

    gitster authored
    Clarify in the documentation that "remote.<nick>.pushURL" and
    "remote.<nick>.URL" are there to name the same repository accessed
    via different transports, not two separate repositories.
    
    * jc/remote-set-url-doc:
      Documentation/git-remote.txt: stress that set-url is not for triangular
  7. Junio C Hamano

    Merge branch 'ch/new-gpg-drops-rfc-1991'

    gitster authored
    Older GnuPG implementations may not correctly import the keyring
    material we prepare for the tests to use.
    
    * ch/new-gpg-drops-rfc-1991:
      t/lib-gpg: sanity-check that we can actually sign
      t/lib-gpg: include separate public keys in keyring.gpg
  8. Junio C Hamano

    Merge branch 'ye/http-accept-language'

    gitster authored
    Using environment variable LANGUAGE and friends on the client side,
    HTTP-based transports now send Accept-Language when making requests.
    
    * ye/http-accept-language:
      http: add Accept-Language header if possible
  9. Junio C Hamano

    Merge branch 'av/wincred-with-at-in-username-fix'

    gitster authored
    The credential helper for Windows (in contrib/) used to mishandle
    a user name with an at-sign in it.
    
    * av/wincred-with-at-in-username-fix:
      wincred: fix get credential if username has "@"
Commits on Feb 17, 2015
  1. Junio C Hamano

    Post 2.3 cycle (batch #2)

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

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

    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
  3. Junio C Hamano

    Merge branch 'jc/t4122-use-test-write-lines'

    gitster authored
    * jc/t4122-use-test-write-lines:
      t4122: use test_write_lines from test-lib-functions
  4. Junio C Hamano

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

    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
  5. Junio C Hamano

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

    gitster authored
    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
  6. Junio C Hamano

    Merge branch 'jc/diff-format-doc'

    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
  7. Junio C Hamano

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

    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
  8. Junio C Hamano

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

    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
  9. Junio C Hamano

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

    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?
  10. Junio C Hamano

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

    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
  11. Junio C Hamano

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

    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
  12. Junio C Hamano

    Merge branch 'ks/rebase-i-abbrev'

    gitster authored
    The insn sheet "git rebase -i" creates did not fully honor
    core.abbrev settings.
    
    * ks/rebase-i-abbrev:
      rebase -i: use full object name internally throughout the script
  13. Junio C Hamano

    Merge branch 'mh/deref-symref-over-helper-transport'

    gitster authored
    "git fetch" over a remote-helper that cannot respond to "list"
    command could not fetch from a symbolic reference e.g. HEAD.
    
    * mh/deref-symref-over-helper-transport:
      transport-helper: do not request symbolic refs to remote helpers
Commits on Feb 12, 2015
  1. Mike Hommey Junio C Hamano

    transport-helper: fix typo in error message when --signed is not supp…

    glandium authored gitster committed
    …orted
    
    Signed-off-by: Mike Hommey <mh@glandium.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Feb 11, 2015
  1. Junio C Hamano

    Post 2.3 cycle (batch #1)

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

    Merge branch 'ah/usage-strings'

    gitster authored
    * ah/usage-strings:
      standardize usage info string format
  3. Junio C Hamano

    Merge branch 'jc/pretty-format-doc'

    gitster authored
    * jc/pretty-format-doc:
      "log --pretty" documentation: do not forget "tformat:"
  4. Junio C Hamano

    Merge branch 'jc/unused-symbols'

    gitster authored
    Mark file-local symbols as "static", and drop functions that nobody
    uses.
    
    * jc/unused-symbols:
      shallow.c: make check_shallow_file_for_update() static
      remote.c: make clear_cas_option() static
      urlmatch.c: make match_urls() static
      revision.c: make save_parents() and free_saved_parents() static
      line-log.c: make line_log_data_init() static
      pack-bitmap.c: make pack_bitmap_filename() static
      prompt.c: remove git_getpass() nobody uses
      http.c: make finish_active_slot() and handle_curl_result() static
  5. Junio C Hamano

    Merge branch 'jc/push-to-checkout'

    gitster authored
    Extending the js/push-to-deploy topic, the behaviour of "git push"
    when updating the working tree and the index with an update to the
    branch that is checked out can be tweaked by push-to-checkout hook.
    
    * jc/push-to-checkout:
      receive-pack: support push-to-checkout hook
      receive-pack: refactor updateInstead codepath
  6. Junio C Hamano

    Merge branch 'sb/atomic-push'

    gitster authored
    "git push" has been taught a "--atomic" option that makes push to
    update more than one ref an "all-or-none" affair.
    
    * sb/atomic-push:
      Document receive.advertiseatomic
      t5543-atomic-push.sh: add basic tests for atomic pushes
      push.c: add an --atomic argument
      send-pack.c: add --atomic command line argument
      send-pack: rename ref_update_to_be_sent to check_to_send_update
      receive-pack.c: negotiate atomic push support
      receive-pack.c: add execute_commands_atomic function
      receive-pack.c: move transaction handling in a central place
      receive-pack.c: move iterating over all commands outside execute_commands
      receive-pack.c: die instead of error in case of possible future bug
      receive-pack.c: shorten the execute_commands loop over all commands
  7. Junio C Hamano

    Merge branch 'mh/reflog-expire'

    gitster authored
    Restructure "reflog expire" to fit the reflogs better with the
    recently updated ref API.
    
    Looked reasonable (except that some shortlog entries stood out like
    a sore thumb).
    
    * mh/reflog-expire: (24 commits)
      refs.c: let fprintf handle the formatting
      refs.c: don't expose the internal struct ref_lock in the header file
      lock_any_ref_for_update(): inline function
      refs.c: remove unlock_ref/close_ref/commit_ref from the refs api
      reflog_expire(): new function in the reference API
      expire_reflog(): treat the policy callback data as opaque
      Move newlog and last_kept_sha1 to "struct expire_reflog_cb"
      expire_reflog(): move rewrite to flags argument
      expire_reflog(): move verbose to flags argument
      expire_reflog(): pass flags through to expire_reflog_ent()
      struct expire_reflog_cb: a new callback data type
      Rename expire_reflog_cb to expire_reflog_policy_cb
      expire_reflog(): move updateref to flags argument
      expire_reflog(): move dry_run to flags argument
      expire_reflog(): add a "flags" argument
      expire_reflog(): extract two policy-related functions
      Extract function should_expire_reflog_ent()
      expire_reflog(): use a lock_file for rewriting the reflog file
      expire_reflog(): return early if the reference has no reflog
      expire_reflog(): rename "ref" parameter to "refname"
      ...
  8. Junio C Hamano

    Merge branch 'cj/log-invert-grep'

    gitster authored
    "git log --invert-grep --grep=WIP" will show only commits that do
    not have the string "WIP" in their messages.
    
    * cj/log-invert-grep:
      log: teach --invert-grep option
  9. Junio C Hamano

    Merge branch 'km/gettext-n'

    gitster authored
    * km/gettext-n:
      gettext.h: add parentheses around N_ expansion if supported
  10. Junio C Hamano

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

    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
  11. Junio C Hamano

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

    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
  12. Junio C Hamano

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

    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
Something went wrong with that request. Please try again.