Skip to content


Subversion checkout URL

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

    Sync with maint

    gitster authored
    * maint:
      Git 2.4.8
  2. @gitster

    First batch for 2.6

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

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

    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
  4. @gitster

    Merge branch 'jk/refspec-parse-wildcard'

    gitster authored
    Allow an asterisk as a substring (as opposed to the entirety) of
    a path component for both side of a refspec, e.g.
    * jk/refspec-parse-wildcard:
      refs: loosen restriction on wildcard "*" refspecs
      refs: cleanup comments regarding check_refname_component()
  5. @gitster

    Merge branch 'da/subtree-date-confusion'

    gitster authored
    "git subtree" (in contrib/) depended on "git log" output to be
    stable, which was a no-no.  Apply a workaround to force a
    particular date format.
    * da/subtree-date-confusion:
      contrib/subtree: ignore configuration
  6. @gitster

    Merge branch 'jx/do-not-crash-receive-pack-wo-head'

    gitster authored
    An attempt to delete a ref by pushing into a repositorywhose HEAD
    symbolic reference points at an unborn branch that cannot be
    created due to ref D/F conflict (e.g. refs/heads/a/b exists, HEAD
    points at refs/heads/a) failed.
    * jx/do-not-crash-receive-pack-wo-head:
      receive-pack: crash when checking with non-exist HEAD
  7. @gitster

    Merge branch 'db/send-pack-user-signingkey'

    gitster authored
    The low-level "git send-pack" did not honor 'user.signingkey'
    configuration variable when sending a signed-push.
    * db/send-pack-user-signingkey:
      builtin/send-pack.c: respect user.signingkey
  8. @gitster

    Merge branch 'zb/userdiff-fountain'

    gitster authored
    New userdiff pattern definition for fountain screenwriting markup
    * zb/userdiff-fountain:
      userdiff: add support for Fountain documents
  9. @gitster

    Merge branch 'dt/refs-backend-preamble'

    gitster authored
    In preparation for allowing different "backends" to store the refs
    in a way different from the traditional "one ref per file in $GIT_DIR
    or in a $GIT_DIR/packed-refs file" filesystem storage, reduce
    direct filesystem access to ref-like things like CHERRY_PICK_HEAD
    from scripts and programs.
    * dt/refs-backend-preamble:
      git-stash: use update-ref --create-reflog instead of creating files
      update-ref and tag: add --create-reflog arg
      refs: add REF_FORCE_CREATE_REFLOG flag
      git-reflog: add exists command
      refs: new public ref function: safe_create_reflog
      refs: break out check for reflog autocreation
      refs.c: add err arguments to reflog functions
  10. @gitster

    Merge branch 'as/sparse-checkout-removal'

    gitster authored
    "sparse checkout" misbehaved for a path that is excluded from the
    checkout when switching between branches that differ at the path.
    * as/sparse-checkout-removal:
      unpack-trees: don't update files with CE_WT_REMOVE set
  11. @gitster

    Merge branch 'jk/date-mode-format'

    gitster authored
    Teach "git log" and friends a new "--date=format:..." option to
    format timestamps using system's strftime(3).
    * jk/date-mode-format:
      strbuf: make strbuf_addftime more robust
      introduce "format" date-mode
      convert "enum date_mode" into a struct
      show-branch: use DATE_RELATIVE instead of magic number
  12. @gitster

    Merge branch 'pt/am-tests'

    gitster authored
    * pt/am-tests:
      t3901: test git-am encoding conversion
      t3418: non-interactive rebase --continue with rerere enabled
      t4150: tests for am --[no-]scissors
      t4150: am with post-applypatch hook
      t4150: am with pre-applypatch hook
      t4150: am with applypatch-msg hook
      t4150: am --resolved fails if index has unmerged entries
      t4150: am --resolved fails if index has no changes
      t4150: am refuses patches when paused
      t4151: am --abort will keep dirty index intact
      t4150: am fails if index is dirty
      t4150: am.messageid really adds the message id
  13. @gitster

    Merge branch 'sg/bash-prompt-untracked-optim'

    gitster authored
    Optimize computation of untracked status indicator by bash prompt
    script (in contrib/).
    * sg/bash-prompt-untracked-optim:
      bash prompt: faster untracked status indicator with untracked directories
      bash prompt: test untracked files status indicator with untracked dirs
  14. @gitster

    Merge branch 'cb/uname-in-untracked'

    gitster authored
    An experimental "untracked cache" feature used uname(2) in a
    slightly unportable way.
    * cb/uname-in-untracked:
      untracked: fix detection of uname(2) failure
  15. @gitster

    Merge branch 'se/doc-checkout-ours-theirs'

    gitster authored
    A "rebase" replays changes of the local branch on top of something
    else, as such they are placed in stage #3 and referred to as
    "theirs", while the changes in the new base, typically a foreign
    work, are placed in stage #2 and referred to as "ours".  Clarify
    the "checkout --ours/--theirs".
    * se/doc-checkout-ours-theirs:
      checkout: document subtlety around --ours/--theirs
  16. @gitster

    Merge branch 'ib/scripted-parse-opt-better-hint-string'

    gitster authored
    The "rev-parse --parseopt" mode parsed the option specification
    and the argument hint in a strange way to allow '=' and other
    special characters in the option name while forbidding them from
    the argument hint.  This made it impossible to define an option
    like "--pair <key>=<value>" with "pair=key=value" specification,
    which instead would have defined a "--pair=key <value>" option.
    * ib/scripted-parse-opt-better-hint-string:
      rev-parse --parseopt: allow [*=?!] in argument hints
  17. @gitster

    Merge branch 'mh/fast-import-optimize-current-from'

    gitster authored
    Often a fast-import stream builds a new commit on top of the
    previous commit it built, and it often unconditionally emits a
    "from" command to specify the first parent, which can be omitted in
    such a case.  This caused fast-import to forget the tree of the
    previous commit and then re-read it from scratch, which was
    inefficient.  Optimize for this common case.
    * mh/fast-import-optimize-current-from:
      fast-import: do less work when given "from" matches current branch head
  18. @gitster

    Merge branch 'kn/tag-doc-fix'

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

    Merge branch 'mh/fast-import-get-mark'

    gitster authored
    "git fast-import" learned to respond to the get-mark command via
    its cat-blob-fd interface.
    * mh/fast-import-get-mark:
      fast-import: add a get-mark command
  20. @gitster

    Merge branch 'gr/rebase-i-drop-warn'

    gitster authored
    Add "drop commit-object-name subject" command as another way to
    skip replaying of a commit in "rebase -i", and then punish those
    who do not use it (and instead just remove the lines) by throwing
    a warning.
    * gr/rebase-i-drop-warn:
      git rebase -i: add static check for commands and SHA-1
      git rebase -i: warn about removed commits
      git-rebase -i: add command "drop" to remove a commit
  21. @gitster

    Merge branch 'jc/commit-slab'

    gitster authored
    Memory use reduction when commit-slab facility is used to annotate
    sparsely (which is not recommended in the first place).
    * jc/commit-slab:
      commit-slab: introduce slabname##_peek() function
  22. @gitster

    Merge branch 'dt/log-follow-config'

    gitster authored
    Add a new configuration variable to enable "--follow" automatically
    when "git log" is run with one pathspec argument.
    * dt/log-follow-config:
      log: add "log.follow" configuration variable
  23. @gitster

    Merge branch 'gp/status-rebase-i-info'

    gitster authored
    Teach "git status" to show a more detailed information regarding
    the "rebase -i" session in progress.
    * gp/status-rebase-i-info:
      status: add new tests for status during rebase -i
      status: give more information during rebase -i
      status: differentiate interactive from non-interactive rebases
      status: factor two rebase-related messages together
  24. @gitster

    Merge branch 'jk/cat-file-batch-all'

    gitster authored
    "cat-file" learned "--batch-all-objects" option to enumerate all
    available objects in the repository more quickly than "rev-list
    --all --objects" (the output includes unreachable objects, though).
    * jk/cat-file-batch-all:
      cat-file: sort and de-dup output of --batch-all-objects
      cat-file: add --batch-all-objects option
      cat-file: split batch_one_object into two stages
      cat-file: stop returning value from batch_one_object
      cat-file: add --buffer option
      cat-file: move batch_options definition to top of file
      cat-file: minor style fix in options list
  25. @gitster

    Merge branch 'js/fsck-opt'

    gitster authored
    Allow ignoring fsck errors on specific set of known-to-be-bad
    objects, and also tweaking warning level of various kinds of non
    critical breakages reported.
    * js/fsck-opt:
      fsck: support ignoring objects in `git fsck` via fsck.skiplist
      fsck: git receive-pack: support excluding objects from fsck'ing
      fsck: introduce `git fsck --connectivity-only`
      fsck: support demoting errors to warnings
      fsck: document the new receive.fsck.<msg-id> options
      fsck: allow upgrading fsck warnings to errors
      fsck: optionally ignore specific fsck issues completely
      fsck: disallow demoting grave fsck errors to warnings
      fsck: add a simple test for receive.fsck.<msg-id>
      fsck: make fsck_tag() warn-friendly
      fsck: handle multiple authors in commits specially
      fsck: make fsck_commit() warn-friendly
      fsck: make fsck_ident() warn-friendly
      fsck: report the ID of the error/warning
      fsck (receive-pack): allow demoting errors to warnings
      fsck: offer a function to demote fsck errors to warnings
      fsck: provide a function to parse fsck message IDs
      fsck: introduce identifiers for fsck messages
      fsck: introduce fsck options
  26. @gitster

    Merge branch 'mh/init-delete-refs-api'

    gitster authored
    Clean up refs API and make "git clone" less intimate with the
    implementation detail.
    * mh/init-delete-refs-api:
      delete_ref(): use the usual convention for old_sha1
      cmd_update_ref(): make logic more straightforward
      update_ref(): don't read old reference value before delete
      check_branch_commit(): make first parameter const
      refs.h: add some parameter names to function declarations
      refs: move the remaining ref module declarations to refs.h
      initial_ref_transaction_commit(): check for ref D/F conflicts
      initial_ref_transaction_commit(): check for duplicate refs
      refs: remove some functions from the module's public interface
      initial_ref_transaction_commit(): function for initial ref creation
      repack_without_refs(): make function private
      prune_refs(): use delete_refs()
      prune_remote(): use delete_refs()
      delete_refs(): bail early if the packed-refs file cannot be rewritten
      delete_refs(): make error message more generic
      delete_refs(): new function for the refs API
      delete_ref(): handle special case more explicitly
      remove_branches(): remove temporary
      delete_ref(): move declaration to refs.h
  27. @gitster

    Merge branch 'pt/pull-builtin'

    gitster authored
    Reimplement 'git pull' in C.
    * pt/pull-builtin:
      pull: remove redirection to
      pull --rebase: error on no merge candidate cases
      pull --rebase: exit early when the working directory is dirty
      pull: configure --rebase via branch.<name>.rebase or pull.rebase
      pull: teach git pull about --rebase
      pull: set reflog message
      pull: implement pulling into an unborn branch
      pull: fast-forward working tree if head is updated
      pull: check if in unresolved merge state
      pull: support pull.ff config
      pull: error on no merge candidates
      pull: pass git-fetch's options to git-fetch
      pull: pass git-merge's options to git-merge
      pull: pass verbosity, --progress flags to fetch and merge
      pull: implement fetch + merge
      pull: implement skeletal builtin pull
      argv-array: implement argv_array_pushv()
      parse-options-cb: implement parse_opt_passthru_argv()
      parse-options-cb: implement parse_opt_passthru()
  28. @gitster

    Merge branch 'jk/pkt-log-pack'

    gitster authored
    Enhance packet tracing machinery to allow capturing an incoming
    pack data to a file for debugging.
    * jk/pkt-log-pack:
      pkt-line: support tracing verbatim pack contents
      pkt-line: tighten sideband PACK check when tracing
      pkt-line: simplify starts_with checks in packet tracing
  29. @gitster

    Merge branch 'mr/rebase-i-customize-insn-sheet'

    gitster authored
    "git rebase -i"'s list of todo is made configurable.
    * mr/rebase-i-customize-insn-sheet: add config option for custom instruction format
  30. @gitster

    Merge branch 'rl/send-email-aliases'

    gitster authored
    "git send-email" now performs alias-expansion on names that are
    given via --cccmd, etc.
    This round comes with a lot more enhanced e-mail address parser,
    which makes it a bit scary, but as long as it works as designed, it
    makes it wonderful ;-).
    * rl/send-email-aliases:
      send-email: suppress meaningless whitespaces in from field
      send-email: allow multiple emails using --cc, --to and --bcc
      send-email: consider quote as delimiter instead of character
      send-email: reduce dependencies impact on parse_address_line
      send-email: minor code refactoring
      send-email: allow use of aliases in the From field of --compose mode
      send-email: refactor address list process
      t9001-send-email: refactor header variable fields replacement
      send-email: allow aliases in patch header and command script outputs
      t9001-send-email: move script creation in a setup test
  31. @gitster

    Merge branch 'kb/i18n-doc'

    gitster authored
    * kb/i18n-doc:
      Documentation/i18n.txt: clarify character encoding support
  32. @gitster

    Merge branch 'nd/export-worktree'

    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
  33. @gitster

    Merge branch 'ee/clean-remove-dirs'

    gitster authored
    Replace "is this subdirectory a separate repository that should not
    be touched?" check "git clean" does by checking if it has .git/HEAD
    using the submodule-related code with a more optimized check.
    * ee/clean-remove-dirs:
      read_gitfile_gently: fix use-after-free
      clean: improve performance when removing lots of directories
      p7300: add performance tests for clean
      t7300: add tests to document behavior of clean and nested git
      setup: sanity check file size in read_gitfile_gently
      setup: add gentle version of read_gitfile
  34. @gitster

    Merge branch 'cb/parse-magnitude'

    gitster authored
    Move machinery to parse human-readable scaled numbers like 1k, 4M,
    and 2G as an option parameter's value from pack-objects to
    parse-options API, to make it available to other codepaths.
    * cb/parse-magnitude:
      parse-options: move unsigned long option parsing out of pack-objects.c
      test-parse-options: update to handle negative ints
  35. @gitster

    Merge branch 'bc/gpg-verify-raw'

    gitster authored
    "git verify-tag" and "git verify-commit" have been taught to share
    more code, and then learned to optionally show the verification
    message from the underlying GPG implementation.
    * bc/gpg-verify-raw:
      verify-tag: add option to print raw gpg status information
      verify-commit: add option to print raw gpg status information
      gpg: centralize printing signature buffers
      gpg: centralize signature check
      verify-commit: add test for exit status on untrusted signature
      verify-tag: share code with verify-commit
      verify-tag: add tests
Something went wrong with that request. Please try again.