Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on Dec 17, 2014
  1. Junio C Hamano

    Sync with v2.0.5

    gitster authored
    * maint-2.0:
      Git 2.0.5
      Git 1.9.5
      Git 1.8.5.6
      fsck: complain about NTFS ".git" aliases in trees
      read-cache: optionally disallow NTFS .git variants
      path: add is_ntfs_dotgit() helper
      fsck: complain about HFS+ ".git" aliases in trees
      read-cache: optionally disallow HFS+ .git variants
      utf8: add is_hfs_dotgit() helper
      fsck: notice .git case-insensitively
      t1450: refactor ".", "..", and ".git" fsck tests
      verify_dotfile(): reject .git case-insensitively
      read-tree: add tests for confusing paths like ".." and ".git"
      unpack-trees: propagate errors adding entries to the index
  2. Junio C Hamano

    Sync with v1.9.5

    gitster authored
    * maint-1.9:
      Git 1.9.5
      Git 1.8.5.6
      fsck: complain about NTFS ".git" aliases in trees
      read-cache: optionally disallow NTFS .git variants
      path: add is_ntfs_dotgit() helper
      fsck: complain about HFS+ ".git" aliases in trees
      read-cache: optionally disallow HFS+ .git variants
      utf8: add is_hfs_dotgit() helper
      fsck: notice .git case-insensitively
      t1450: refactor ".", "..", and ".git" fsck tests
      verify_dotfile(): reject .git case-insensitively
      read-tree: add tests for confusing paths like ".." and ".git"
      unpack-trees: propagate errors adding entries to the index
  3. Junio C Hamano

    Sync with v1.8.5.6

    gitster authored
    * maint-1.8.5:
      Git 1.8.5.6
      fsck: complain about NTFS ".git" aliases in trees
      read-cache: optionally disallow NTFS .git variants
      path: add is_ntfs_dotgit() helper
      fsck: complain about HFS+ ".git" aliases in trees
      read-cache: optionally disallow HFS+ .git variants
      utf8: add is_hfs_dotgit() helper
      fsck: notice .git case-insensitively
      t1450: refactor ".", "..", and ".git" fsck tests
      verify_dotfile(): reject .git case-insensitively
      read-tree: add tests for confusing paths like ".." and ".git"
      unpack-trees: propagate errors adding entries to the index
Commits on Jun 16, 2014
  1. Junio C Hamano

    Merge branch 'sh/enable-preloadindex'

    gitster authored
    * sh/enable-preloadindex:
      environment.c: enable core.preloadindex by default
Commits on Jun 6, 2014
  1. Junio C Hamano

    Merge branch 'nd/status-auto-comment-char'

    gitster authored
    * nd/status-auto-comment-char:
      commit: allow core.commentChar=auto for character auto selection
      config: be strict on core.commentChar
Commits on Jan 17, 2014
  1. Junio C Hamano

    Merge branch 'nd/shallow-clone'

    gitster authored
    Fetching from a shallow-cloned repository used to be forbidden,
    primarily because the codepaths involved were not carefully vetted
    and we did not bother supporting such usage. This attempts to allow
    object transfer out of a shallow-cloned repository in a controlled
    way (i.e. the receiver become a shallow repository with truncated
    history).
    
    * nd/shallow-clone: (31 commits)
      t5537: fix incorrect expectation in test case 10
      shallow: remove unused code
      send-pack.c: mark a file-local function static
      git-clone.txt: remove shallow clone limitations
      prune: clean .git/shallow after pruning objects
      clone: use git protocol for cloning shallow repo locally
      send-pack: support pushing from a shallow clone via http
      receive-pack: support pushing to a shallow clone via http
      smart-http: support shallow fetch/clone
      remote-curl: pass ref SHA-1 to fetch-pack as well
      send-pack: support pushing to a shallow clone
      receive-pack: allow pushes that update .git/shallow
      connected.c: add new variant that runs with --shallow-file
      add GIT_SHALLOW_FILE to propagate --shallow-file to subprocesses
      receive/send-pack: support pushing from a shallow clone
      receive-pack: reorder some code in unpack()
      fetch: add --update-shallow to accept refs that update .git/shallow
      upload-pack: make sure deepening preserves shallow roots
      fetch: support fetching from a shallow repository
      clone: support remote shallow repository
      ...
Commits on Oct 17, 2013
  1. Junio C Hamano

    Merge branch 'nd/git-dir-pointing-at-gitfile' into maint

    gitster authored
    * nd/git-dir-pointing-at-gitfile:
      Make setup_git_env() resolve .git file when $GIT_DIR is not specified
Commits on Jul 25, 2013
  1. Junio C Hamano

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

    gitster authored
    If somebody wants to only know on-disk footprint of an object
    without having to know its type or payload size, we can bypass a
    lot of code to cheaply learn it.
    
    * jk/cat-file-batch-optim:
      Fix some sparse warnings
      sha1_object_info_extended: pass object_info to helpers
      sha1_object_info_extended: make type calculation optional
      packed_object_info: make type lookup optional
      packed_object_info: hoist delta type resolution to helper
      sha1_loose_object_info: make type lookup optional
      sha1_object_info_extended: rename "status" to "type"
      cat-file: disable object/refname ambiguity check for batch mode
Commits on Mar 25, 2013
  1. Junio C Hamano

    Merge branch 'jk/alias-in-bare'

    gitster authored
    An aliased command spawned from a bare repository that does not say
    it is bare with "core.bare = yes" is treated as non-bare by mistake.
    
    * jk/alias-in-bare:
      setup: suppress implicit "." work-tree for bare repos
      environment: add GIT_PREFIX to local_repo_env
      cache.h: drop LOCAL_REPO_ENV_SIZE
Commits on Feb 4, 2013
  1. Junio C Hamano

    Merge branch 'jc/custom-comment-char'

    gitster authored
    Allow a configuration variable core.commentchar to customize the
    character used to comment out the hint lines in the edited text from
    the default '#'.
    
    * jc/custom-comment-char:
      Allow custom "comment char"
Commits on Jan 16, 2013
  1. Junio C Hamano

    Allow custom "comment char"

    gitster authored
    Some users do want to write a line that begin with a pound sign, #,
    in their commit log message.  Many tracking system recognise
    a token of #<bugid> form, for example.
    
    The support we offer these use cases is not very friendly to the end
    users.  They have a choice between
    
     - Don't do it.  Avoid such a line by rewrapping or indenting; and
    
     - Use --cleanup=whitespace but remove all the hint lines we add.
    
    Give them a way to set a custom comment char, e.g.
    
        $ git -c core.commentchar="%" commit
    
    so that they do not have to do either of the two workarounds.
    
    [jc: although I started the topic, all the tests and documentation
    updates, many of the call sites of the new strbuf_add_commented_*()
    functions, and the change to git-submodule.sh scripted Porcelain are
    from Ralf.]
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Dec 17, 2011
  1. Junio C Hamano

    Merge branch 'jc/stream-to-pack'

    gitster authored
    * jc/stream-to-pack:
      bulk-checkin: replace fast-import based implementation
      csum-file: introduce sha1file_checkpoint
      finish_tmp_packfile(): a helper function
      create_tmp_packfile(): a helper function
      write_pack_header(): a helper function
    
    Conflicts:
    	pack.h
Commits on Dec 9, 2011
  1. Junio C Hamano

    Merge branch 'jc/request-pull-show-head-4'

    gitster authored
    * jc/request-pull-show-head-4:
      request-pull: use the annotated tag contents
      fmt-merge-msg.c: Fix an "dubious one-bit signed bitfield" sparse error
      environment.c: Fix an sparse "symbol not declared" warning
      builtin/log.c: Fix an "Using plain integer as NULL pointer" warning
      fmt-merge-msg: use branch.$name.description
      request-pull: use the branch description
      request-pull: state what commit to expect
      request-pull: modernize style
      branch: teach --edit-description option
      format-patch: use branch description in cover letter
      branch: add read_branch_desc() helper function
    
    Conflicts:
    	builtin/branch.c
Commits on Dec 1, 2011
  1. Junio C Hamano

    bulk-checkin: replace fast-import based implementation

    gitster authored
    This extends the earlier approach to stream a large file directly from the
    filesystem to its own packfile, and allows "git add" to send large files
    directly into a single pack. Older code used to spawn fast-import, but the
    new bulk-checkin API replaces it.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Oct 18, 2011
  1. Junio C Hamano

    Merge branch 'bc/attr-ignore-case'

    gitster authored
    * bc/attr-ignore-case:
      attr.c: respect core.ignorecase when matching attribute patterns
      attr: read core.attributesfile from git_default_core_config
      builtin/mv.c: plug miniscule memory leak
      cleanup: use internal memory allocation wrapper functions everywhere
      attr.c: avoid inappropriate access to strbuf "buf" member
    
    Conflicts:
    	transport-helper.c
Commits on Oct 7, 2011
  1. Junio C Hamano

    fmt-merge-msg: use branch.$name.description

    gitster authored
    This teaches "merge --log" and fmt-merge-msg to use branch description
    information when merging a local topic branch into the mainline. The
    description goes between the branch name label and the list of commit
    titles.
    
    The refactoring to share the common configuration parsing between
    merge and fmt-merge-msg needs to be made into a separate patch.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Oct 6, 2011
  1. Junio C Hamano

    attr: read core.attributesfile from git_default_core_config

    gitster authored
    This code calls git_config from a helper function to parse the config entry
    it is interested in.  Calling git_config in this way may cause a problem if
    the helper function can be called after a previous call to git_config by
    another function since the second call to git_config may reset some
    variable to the value in the config file which was previously overridden.
    
    The above is not a problem in this case since the function passed to
    git_config only parses one config entry and the variable it sets is not
    assigned outside of the parsing function.  But a programmer who desires
    all of the standard config options to be parsed may be tempted to modify
    git_attr_config() so that it falls back to git_default_config() and then it
    _would_ be vulnerable to the above described behavior.
    
    So, move the call to git_config up into the top-level cmd_* function and
    move the responsibility for parsing core.attributesfile into the main
    config file parser.
    
    Which is only the logical thing to do ;-)
    
    Signed-off-by: Brandon Casey <drafnel@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Aug 29, 2011
  1. Junio C Hamano

    Merge branch 'nd/maint-clone-gitdir'

    gitster authored
    * nd/maint-clone-gitdir:
      clone: allow to clone from .git file
      read_gitfile_gently(): rename misnamed function to read_gitfile()
Commits on Aug 22, 2011
  1. Junio C Hamano

    read_gitfile_gently(): rename misnamed function to read_gitfile()

    gitster authored
    The function was not gentle at all to the callers and died without giving
    them a chance to deal with possible errors. Rename it to read_gitfile(),
    and update all the callers.
    
    As no existing caller needs a true "gently" variant, we do not bother
    adding one at this point.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Aug 18, 2011
  1. Junio C Hamano

    Merge branch 'js/ref-namespaces'

    gitster authored
    * js/ref-namespaces:
      ref namespaces: tests
      ref namespaces: documentation
      ref namespaces: Support remote repositories via upload-pack and receive-pack
      ref namespaces: infrastructure
      Fix prefix handling in ref iteration functions
Commits on Jul 7, 2011
  1. Junio C Hamano

    core: log offset pack data accesses happened

    gitster authored
    In a workload other than "git log" (without pathspec nor any option that
    causes us to inspect trees and blobs), the recency pack order is said to
    cause the access jump around quite a bit. Add a hook to allow us observe
    how bad it is.
    
    "git config core.logpackaccess /var/tmp/pal.txt" will give you the log
    in the specified file.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on May 20, 2011
  1. Junio C Hamano

    Merge branch 'jc/replacing'

    gitster authored
    * jc/replacing:
      read_sha1_file(): allow selective bypassing of replacement mechanism
      inline lookup_replace_object() calls
      read_sha1_file(): get rid of read_sha1_file_repl() madness
      t6050: make sure we test not just commit replacement
      Declare lookup_replace_object() in cache.h, not in commit.h
    
    Conflicts:
    	environment.c
Commits on May 15, 2011
  1. Junio C Hamano

    inline lookup_replace_object() calls

    gitster authored
    In a repository without object replacement, lookup_replace_object() should
    be a no-op. Check the flag "read_replace_refs" on the side of the caller,
    and bypess a function call when we know we are not dealing with replacement.
    
    Also, even when we are set up to replace objects, if we do not find any
    replacement defined, flip that flag off to avoid function call overhead
    for all the later object accesses.
    
    As this change the semantics of the flag from "do we need read the
    replacement definition?" to "do we need to check with the lookup table?"
    the flag needs to be renamed later to something saner, e.g. "use_replace",
    when the codebase is calmer, but not now.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on May 9, 2011
  1. Junio C Hamano

    convert: rename the "eol" global variable to "core_eol"

    gitster authored
    Yes, it is clear that "eol" wants to mean some sort of end-of-line thing,
    but as the name of a global variable, it is way too short to describe what
    kind of end-of-line thing it wants to represent. Besides, there are many
    codepaths that want to use their own local "char *eol" variable to point
    at the end of the current line they are processing.
    
    This global variable holds what we read from core.eol configuration
    variable. Name it as such.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Apr 27, 2011
  1. Junio C Hamano

    Merge branch 'jc/pack-objects-bigfile'

    gitster authored
    * jc/pack-objects-bigfile:
      Teach core.bigfilethreashold to pack-objects
Commits on Apr 6, 2011
  1. Junio C Hamano

    Teach core.bigfilethreashold to pack-objects

    gitster authored
    The pack-objects command should take notice of the object file and
    refrain from attempting to delta large ones, to be consistent with
    the fast-import command.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Mar 23, 2011
  1. Junio C Hamano

    Merge branch 'lt/default-abbrev'

    gitster authored
    * lt/default-abbrev:
      Rename core.abbrevlength back to core.abbrev
      Make the default abbrev length configurable
Commits on Mar 11, 2011
  1. Junio C Hamano

    Revert "core.abbrevguard: Ensure short object names stay unique a bit…

    gitster authored
    … longer"
    
    This reverts commit 72a5b56, as adding
    fixed number of hexdigits more than necessary to make one object name
    locally unique does not help in futureproofing the uniqueness of names
    we generate today.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Dec 28, 2010
  1. Junio C Hamano

    Merge branch 'nd/setup'

    gitster authored
    * nd/setup: (47 commits)
      setup_work_tree: adjust relative $GIT_WORK_TREE after moving cwd
      git.txt: correct where --work-tree path is relative to
      Revert "Documentation: always respect core.worktree if set"
      t0001: test git init when run via an alias
      Remove all logic from get_git_work_tree()
      setup: rework setup_explicit_git_dir()
      setup: clean up setup_discovered_git_dir()
      t1020-subdirectory: test alias expansion in a subdirectory
      setup: clean up setup_bare_git_dir()
      setup: limit get_git_work_tree()'s to explicit setup case only
      Use git_config_early() instead of git_config() during repo setup
      Add git_config_early()
      git-rev-parse.txt: clarify --git-dir
      t1510: setup case #31
      t1510: setup case #30
      t1510: setup case #29
      t1510: setup case #28
      t1510: setup case #27
      t1510: setup case #26
      t1510: setup case #25
      ...
Commits on Dec 8, 2010
  1. Junio C Hamano

    Merge branch 'ks/maint-getenv-fix'

    gitster authored
    * ks/maint-getenv-fix:
      setup: make sure git_dir path is in a permanent buffer, getenv(3) case
Commits on Dec 4, 2010
  1. Junio C Hamano

    Merge branch 'jn/thinner-wrapper'

    gitster authored
    * jn/thinner-wrapper:
      Remove pack file handling dependency from wrapper.o
      pack-objects: mark file-local variable static
      wrapper: give zlib wrappers their own translation unit
      strbuf: move strbuf_branchname to sha1_name.c
      path helpers: move git_mkstemp* to wrapper.c
      wrapper: move odb_* to environment.c
      wrapper: move xmmap() to sha1_file.c
  2. Junio C Hamano

    Merge branch 'pn/commit-autosquash'

    gitster authored
    * pn/commit-autosquash:
      add tests of commit --squash
      commit: --squash option for use with rebase --autosquash
      add tests of commit --fixup
      commit: --fixup option for use with rebase --autosquash
      pretty.c: teach format_commit_message() to reencode the output
      commit: helper methods to reduce redundant blocks of code
    
    Conflicts:
    	Documentation/git-commit.txt
    	t/t3415-rebase-autosquash.sh
Commits on Oct 29, 2010
  1. Junio C Hamano

    core.abbrevguard: Ensure short object names stay unique a bit longer

    gitster authored
    Even though git makes sure that it uses enough hexdigits to show an
    abbreviated object name unambiguously, as more objects are added to the
    repository over time, a short name that used to be unique will stop being
    unique.  Git uses this many extra hexdigits that are more than necessary
    to make the object name currently unique, in the hope that its output will
    stay unique a bit longer.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Sep 8, 2010
  1. Junio C Hamano

    Merge branch 'kf/askpass-config'

    gitster authored
    * kf/askpass-config:
      Extend documentation of core.askpass and GIT_ASKPASS.
      Allow core.askpass to override SSH_ASKPASS.
      Add a new option 'core.askpass'.
  2. Junio C Hamano

    Merge branch 'jk/maint-pass-c-config-in-env'

    gitster authored
    * jk/maint-pass-c-config-in-env:
      do not pass "git -c foo=bar" params to transport helpers
      pass "git -c foo=bar" params through environment
Something went wrong with that request. Please try again.