Skip to content

HTTPS clone URL

Subversion checkout URL

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

    Sync with master

    gitster authored
    * master:
      t7063: hide stderr from setup inside prereq
  2. @gitster

    Merge branch 'nd/untracked-cache'

    gitster authored
    * nd/untracked-cache:
      t7063: hide stderr from setup inside prereq
  3. @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 master

    gitster authored
  2. @gitster

    Merge branch 'bc/object-id' into next

    gitster authored
    for_each_ref() callback functions were taught to name the objects
    not with "unsigned char sha1[20]" but with "struct object_id".
    
    * bc/object-id: (56 commits)
      struct ref_lock: convert old_sha1 member to object_id
      warn_if_dangling_symref(): convert local variable "junk" to object_id
      each_ref_fn_adapter(): remove adapter
      rev_list_insert_ref(): remove unneeded arguments
      rev_list_insert_ref_oid(): new function, taking an object_oid
      mark_complete(): remove unneeded arguments
      mark_complete_oid(): new function, taking an object_oid
      clear_marks(): rewrite to take an object_id argument
      mark_complete(): rewrite to take an object_id argument
      send_ref(): convert local variable "peeled" to object_id
      upload-pack: rewrite functions to take object_id arguments
      find_symref(): convert local variable "unused" to object_id
      find_symref(): rewrite to take an object_id argument
      write_one_ref(): rewrite to take an object_id argument
      write_refs_to_temp_dir(): convert local variable sha1 to object_id
      submodule: rewrite to take an object_id argument
      shallow: rewrite functions to take object_id arguments
      handle_one_ref(): rewrite to take an object_id argument
      add_info_ref(): rewrite to take an object_id argument
      handle_one_reflog(): rewrite to take an object_id argument
      ...
  3. @gitster

    Merge branch 'jk/at-push-sha1' into next

    gitster authored
    Introduce <branch>@{push} short-hand to denote the remote-tracking
    branch that tracks the branch at the remote the <branch> would be
    pushed to.
    
    * jk/at-push-sha1:
      for-each-ref: accept "%(push)" format
      for-each-ref: use skip_prefix instead of starts_with
      sha1_name: implement @{push} shorthand
      sha1_name: refactor interpret_upstream_mark
      sha1_name: refactor upstream_mark
      remote.c: add branch_get_push
      remote.c: return upstream name from stat_tracking_info
      remote.c: untangle error logic in branch_get_upstream
      remote.c: report specific errors from branch_get_upstream
      remote.c: introduce branch_get_upstream helper
      remote.c: hoist read_config into remote_get_1
      remote.c: provide per-branch pushremote name
      remote.c: hoist branch.*.remote lookup out of remote_get_1
      remote.c: drop "remote" pointer from "struct branch"
      remote.c: refactor setup of branch->merge list
      remote.c: drop default_remote_name variable
  4. @gitster

    Merge branch 'sb/test-bitmap-free-at-end' into next

    gitster authored
    * sb/test-bitmap-free-at-end:
      test_bitmap_walk: free bitmap with bitmap_free
  5. @gitster

    Merge branch 'mm/rebase-i-post-rewrite-exec' into next

    gitster authored
    "git rebase -i" fired post-rewrite hook when it shouldn't (namely,
    when it was told to stop sequencing with 'exec' insn).
    
    * mm/rebase-i-post-rewrite-exec:
      t5407: use <<- to align the expected output
      rebase -i: fix post-rewrite hook with failed exec command
      rebase -i: demonstrate incorrect behavior of post-rewrite
  6. @gitster

    Merge branch 'fm/fetch-raw-sha1' into next

    gitster authored
    "git upload-pack" that serves "git fetch" can be told to serve
    commits that are not at the tip of any ref as long as they are
    reachable from a ref with uploadpack.allowReachableSHA1InWant
    configuration variable.
    
    * fm/fetch-raw-sha1:
      upload-pack: optionally allow fetching reachable sha1
      upload-pack: prepare to extend allow-tip-sha1-in-want
      config.txt: clarify allowTipSHA1InWant with camelCase
  7. @gitster

    Merge branch 'sg/help-group' into next

    gitster authored
    Group list of commands shown by "git help" along the workflow
    elements to help early learners.
    
    * sg/help-group:
      help: respect new common command grouping
      command-list.txt: drop the "common" tag
      generate-cmdlist: parse common group commands
      command-list.txt: add the common groups block
      command-list: prepare machinery for upcoming "common groups" section
  8. @gitster

    Merge branch 'mm/log-format-raw-doc' into next

    gitster authored
    Clarify that "log --raw" and "log --format=raw" are unrelated
    concepts.
    
    * mm/log-format-raw-doc:
      Documentation/log: clarify sha1 non-abbreviation in log --raw
      Documentation/log: clarify what --raw means
  9. @gitster

    Merge branch 'dt/cat-file-follow-symlinks' into next

    gitster authored
    "git cat-file --batch(-check)" learned the "--follow-symlinks"
    option that follows an in-tree symbolic links when asked about an
    object via extended SHA-1 syntax, e.g. HEAD:RelNotes that points at
    Documentation/RelNotes/2.5.0.txt.  With the new option, the command
    behaves as if HEAD:Documentation/RelNotes/2.5.0.txt was given as
    input instead.
    
    * dt/cat-file-follow-symlinks:
      cat-file: add --follow-symlinks to --batch
      sha1_name: get_sha1_with_context learns to follow symlinks
      tree-walk: learn get_tree_entry_follow_symlinks
  10. @gitster

    Merge branch 'rs/janitorial' into next

    gitster authored
    * rs/janitorial:
      dir: remove unused variable sb
      clean: remove unused variable buf
      use file_exists() to check if a file exists in the worktree
  11. @gitster

    Merge branch 'jk/stash-options' into next

    gitster authored
    Make "git stash something --help" error out, so that users can
    safely say "git stash drop --help".
    
    * jk/stash-options:
      stash: recognize "--help" for subcommands
      stash: complain about unknown flags
  12. @gitster

    Merge branch 'da/mergetool-winmerge' into next

    gitster authored
    "git mergetool" learned to drive WinMerge as a backend.
    
    * da/mergetool-winmerge:
      mergetools: add winmerge as a builtin tool
      mergetool--lib: set IFS for difftool and mergetool
  13. @gitster

    Merge branch 'mc/commit-doc-grammofix' into next

    gitster authored
    * mc/commit-doc-grammofix:
      Documentation/git-commit: grammofix
  14. @gitster

    Merge branch 'jh/filter-empty-contents' into next

    gitster authored
    The clean/smudge interface did not work well when filtering an
    empty contents (failed and then passed the empty input through).
    It can be argued that a filter that produces anything but empty for
    an empty input is nonsense, but if the user wants to do strange
    things, then why not?
    
    * jh/filter-empty-contents:
      sha1_file: pass empty buffer to index empty file
  15. @gitster

    Merge branch 'jk/http-backend-deadlock' into next

    gitster authored
    Communication between the HTTP server and http_backend process can
    lead to a dead-lock when relaying a large ref negotiation request.
    Diagnose the situation better, and mitigate it by reading such a
    request first into core (to a reasonable limit).
    
    * jk/http-backend-deadlock:
      http-backend: spool ref negotiation requests to buffer
      t5551: factor out tag creation
      http-backend: fix die recursion with custom handler
  16. @gitster

    Merge branch 'dt/clean-pathspec-filter-then-lstat' into next

    gitster authored
    "git clean pathspec..." tried to lstat(2) and complain even for
    paths outside the given pathspec.
    
    * dt/clean-pathspec-filter-then-lstat:
      clean: only lstat files in pathspec
  17. @gitster

    Sync with 2.4.2

    gitster authored
  18. @gitster

    Git 2.4.2

    gitster authored
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  19. @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
  20. @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
  21. @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
  22. @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
  23. @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
  24. @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
  25. @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
  26. @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
  27. @gitster

    Fifth batch for 2.5 cycle

    gitster authored
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  28. @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()
      ...
  29. @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
  30. @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
  31. @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>
  32. @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
Something went wrong with that request. Please try again.