Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on Aug 25, 2015
  1. @gitster

    Sync with maint

    gitster authored
    * maint:
      pull: pass upload_pack only when it was given
  2. @gitster

    Merge branch 'jk/guess-repo-name-regression-fix' into maint

    gitster authored
    "git clone $URL" in recent releases of Git contains a regression in
    the code that invents a new repository name incorrectly based on
    the $URL.  This has been corrected.
    
    * jk/guess-repo-name-regression-fix:
      clone: use computed length in guess_dir_name
      clone: add tests for output directory
  3. @gitster

    Merge branch 'jk/test-with-x' into maint

    gitster authored
    Running tests with the "-x" option to make them verbose had some
    unpleasant interactions with other features of the test suite.
    
    * jk/test-with-x:
      test-lib: disable trace when test is not verbose
      test-lib: turn off "-x" tracing during chain-lint check
  4. @gitster

    Merge branch 'sb/check-return-from-read-ref' into maint

    gitster authored
    * sb/check-return-from-read-ref:
      transport-helper: die on errors reading refs.
  5. @gitster

    Merge branch 'mm/pull-upload-pack' into maint

    gitster authored
    "git pull" in recent releases of Git has a regression in the code
    that allows custom path to the --upload-pack=<program>.  This has
    been corrected.
    
    Note that this is irrelevant for 'master' with "git pull" rewritten
    in C.
    
    * mm/pull-upload-pack:
      pull: pass upload_pack only when it was given
      pull.sh: quote $upload_pack when passing it to git-fetch
  6. @gitster

    pull: pass upload_pack only when it was given

    gitster authored
    The upload_pack shell variable is initialized to an empty string, so
    conditional expansion with ${upload_pack+"$upload_pack"} would not
    work very well.  You need a colon there.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  7. @gitster

    Fifth batch for 2.6

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

    Merge branch 'cb/open-noatime-clear-errno'

    gitster authored
    When trying to see that an object does not exist, a state errno
    leaked from our "first try to open a packfile with O_NOATIME and
    then if it fails retry without it" logic on a system that refuses
    O_NOATIME.  This confused us and caused us to die, saying that the
    packfile is unreadable, when we should have just reported that the
    object does not exist in that packfile to the caller.
    
    * cb/open-noatime-clear-errno:
      git_open_noatime: return with errno=0 on success
  9. @gitster

    Merge branch 'mh/tempfile'

    gitster authored
    The "lockfile" API has been rebuilt on top of a new "tempfile" API.
    
    * mh/tempfile:
      credential-cache--daemon: use tempfile module
      credential-cache--daemon: delete socket from main()
      gc: use tempfile module to handle gc.pid file
      lock_repo_for_gc(): compute the path to "gc.pid" only once
      diff: use tempfile module
      setup_temporary_shallow(): use tempfile module
      write_shared_index(): use tempfile module
      register_tempfile(): new function to handle an existing temporary file
      tempfile: add several functions for creating temporary files
      prepare_tempfile_object(): new function, extracted from create_tempfile()
      tempfile: a new module for handling temporary files
      commit_lock_file(): use get_locked_file_path()
      lockfile: add accessor get_lock_file_path()
      lockfile: add accessors get_lock_file_fd() and get_lock_file_fp()
      create_bundle(): duplicate file descriptor to avoid closing it twice
      lockfile: move documentation to lockfile.h and lockfile.c
  10. @gitster

    Merge branch 'pt/am-builtin-options'

    gitster authored
    After "git am --opt1" stops, running "git am --opt2" pays attention
    to "--opt2" only for the patch that caused the original invocation
    to stop.
    
    * pt/am-builtin-options:
      am: let --signoff override --no-signoff
      am: let command-line options override saved options
      test_terminal: redirect child process' stdin to a pty
  11. @gitster

    Merge branch 'dt/refs-pseudo'

    gitster authored
    To prepare for allowing a different "ref" backend to be plugged in
    to the system, update_ref()/delete_ref() have been taught about
    ref-like things like MERGE_HEAD that are per-worktree (they will
    always be written to the filesystem inside $GIT_DIR).
    
    * dt/refs-pseudo:
      pseudoref: check return values from read_ref()
      sequencer: replace write_cherry_pick_head with update_ref
      bisect: use update_ref
      pseudorefs: create and use pseudoref update and delete functions
      refs: add ref_type function
      refs: introduce pseudoref and per-worktree ref concepts
  12. @gitster

    Merge branch 'dt/notes-multiple'

    gitster authored
    When linked worktree is used, simultaneous "notes merge" instances
    for the same ref in refs/notes/* are prevented from stomping on
    each other.
    
    * dt/notes-multiple:
      notes: handle multiple worktrees
      worktrees: add find_shared_symref
  13. @gitster

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

    gitster authored
    Test updates for Windows.
    
    * nd/dwim-wildcards-as-pathspecs:
      t2019: skip test requiring '*' in a file name non Windows
  14. @gitster

    Merge branch 'jk/long-error-messages'

    gitster authored
    The codepath to produce error messages had a hard-coded limit to
    the size of the message, primarily to avoid memory allocation while
    calling die().
    
    * jk/long-error-messages:
      vreportf: avoid intermediate buffer
      vreportf: report to arbitrary filehandles
  15. @gitster

    Merge branch 'ee/clean-remove-dirs'

    gitster authored
    Test updates for Windows.
    
    * ee/clean-remove-dirs:
      t7300-clean: require POSIXPERM for chmod 0 test
  16. @gitster

    Merge branch 'jh/strbuf-read-use-read-in-full'

    gitster authored
    strbuf_read() used to have one extra iteration (and an unnecessary
    strbuf_grow() of 8kB), which was eliminated.
    
    * jh/strbuf-read-use-read-in-full:
      strbuf_read(): skip unnecessary strbuf_grow() at eof
Commits on Aug 19, 2015
  1. @gitster

    Sync with maint

    gitster authored
    * maint:
      Start preparing for 2.5.1
  2. @gitster

    Fourth batch for 2.6

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

    Merge branch 'tb/complete-rebase-i-edit-todo'

    gitster authored
    The command-line completion script (in contrib/) has been updated.
    
    * tb/complete-rebase-i-edit-todo:
      completion: offer '--edit-todo' during interactive rebase
  4. @gitster

    Merge branch 'jk/git-path'

    gitster authored
    git_path() and mkpath() are handy helper functions but it is easy
    to misuse, as the callers need to be careful to keep the number of
    active results below 4.  Their uses have been reduced.
    
    * jk/git-path:
      memoize common git-path "constant" files
      get_repo_path: refactor path-allocation
      find_hook: keep our own static buffer
      refs.c: remove_empty_directories can take a strbuf
      refs.c: avoid git_path assignment in lock_ref_sha1_basic
      refs.c: avoid repeated git_path calls in rename_tmp_log
      refs.c: simplify strbufs in reflog setup and writing
      path.c: drop git_path_submodule
      refs.c: remove extra git_path calls from read_loose_refs
      remote.c: drop extraneous local variable from migrate_file
      prefer mkpathdup to mkpath in assignments
      prefer git_pathdup to git_path in some possibly-dangerous cases
      add_to_alternates_file: don't add duplicate entries
      t5700: modernize style
      cache.h: complete set of git_path_submodule helpers
      cache.h: clarify documentation for git_path, et al
  5. @gitster

    Merge branch 'jc/finalize-temp-file'

    gitster authored
    Long overdue micro clean-up.
    
    * jc/finalize-temp-file:
      sha1_file.c: rename move_temp_to_file() to finalize_object_file()
  6. @gitster

    Merge branch 'ps/guess-repo-name-at-root'

    gitster authored
    "git clone $URL", when cloning from a site whose sole purpose is to
    host a single repository (hence, no path after <scheme>://<site>/),
    tried to use the site name as the new repository name, but did not
    remove username or password when <site> part was of the form
    <user>@<pass>:<host>.  The code is taught to redact these.
    
    * ps/guess-repo-name-at-root:
      clone: abort if no dir name could be guessed
      clone: do not use port number as dir name
      clone: do not include authentication data in guessed dir
  7. @gitster

    Merge branch 'jk/guess-repo-name-regression-fix'

    gitster authored
    "git clone $URL" in recent releases of Git contains a regression in
    the code that invents a new repository name incorrectly based on
    the $URL.  This has been corrected.
    
    * jk/guess-repo-name-regression-fix:
      clone: use computed length in guess_dir_name
      clone: add tests for output directory
  8. @gitster

    Merge branch 'jk/negative-hiderefs'

    gitster authored
    A negative !ref entry in multi-value transfer.hideRefs
    configuration can be used to say "don't hide this one".
    
    * jk/negative-hiderefs:
      refs: support negative transfer.hideRefs
      docs/config.txt: reorder hideRefs config
  9. @gitster

    Merge branch 'jk/test-with-x'

    gitster authored
    Running tests with the "-x" option to make them verbose had some
    unpleasant interactions with other features of the test suite.
    
    * jk/test-with-x:
      test-lib: disable trace when test is not verbose
      test-lib: turn off "-x" tracing during chain-lint check
  10. @gitster

    Merge branch 'ps/t1509-chroot-test-fixup'

    gitster authored
    t1509 test that requires a dedicated VM environment had some
    bitrot, which has been corrected.
    
    * ps/t1509-chroot-test-fixup:
      tests: fix cleanup after tests in t1509-root-worktree
      tests: fix broken && chains in t1509-root-worktree
  11. @gitster

    Merge branch 'sb/check-return-from-read-ref'

    gitster authored
    * sb/check-return-from-read-ref:
      transport-helper: die on errors reading refs.
  12. @gitster

    Merge branch 'mm/pull-upload-pack'

    gitster authored
    "git pull" in recent releases of Git has a regression in the code
    that allows custom path to the --upload-pack=<program>.  This has
    been corrected.
    
    Note that this is irrelevant for 'master' with "git pull" rewritten
    in C.
    
    * mm/pull-upload-pack:
      pull.sh: quote $upload_pack when passing it to git-fetch
  13. @gitster

    Start preparing for 2.5.1

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

    Merge branch 'ta/docfix-index-format-tech' into maint

    gitster authored
    * ta/docfix-index-format-tech:
      typofix for index-format.txt
  15. @gitster

    Merge branch 'sb/parse-options-codeformat' into maint

    gitster authored
    * sb/parse-options-codeformat:
      parse-options: align curly braces for all options
  16. @gitster

    Merge branch 'sb/remove-unused-var-from-builtin-add' into maint

    gitster authored
    * sb/remove-unused-var-from-builtin-add:
      add: remove dead code
  17. @gitster

    Merge branch 'kn/tag-doc-fix' into maint

    gitster authored
    * kn/tag-doc-fix:
      Documentation/tag: remove double occurance of "<pattern>"
  18. @gitster

    Merge branch 'es/doc-clean-outdated-tools' into maint

    gitster authored
    * es/doc-clean-outdated-tools:
      Documentation/git-tools: retire manually-maintained list
      Documentation/git-tools: drop references to defunct tools
      Documentation/git-tools: fix item text formatting
      Documentation/git-tools: improve discoverability of Git wiki
      Documentation/git: drop outdated Cogito reference
  19. @gitster

    Merge branch 'nd/export-worktree' into maint

    gitster authored
    Running an aliased command from a subdirectory when the .git thing
    in the working tree is a gitfile pointing elsewhere did not work.
    
    * nd/export-worktree:
      setup: set env $GIT_WORK_TREE when work tree is set, like $GIT_DIR
Something went wrong with that request. Please try again.