Skip to content

HTTPS clone URL

Subversion checkout URL

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

    Ninth batch for 2.6

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

    Merge branch 'dt/commit-preserve-base-index-upon-opportunistic-cache-…

    gitster authored
    …tree-update'
    
    When re-priming the cache-tree opportunistically while committing
    the in-core index as-is, we mistakenly invalidated the in-core
    index too aggressively, causing the experimental split-index code
    to unnecessarily rewrite the on-disk index file(s).
    
    * dt/commit-preserve-base-index-upon-opportunistic-cache-tree-update:
      commit: don't rewrite shared index unnecessarily
  3. @gitster

    Merge branch 'rt/remove-hold-lockfile-for-append'

    gitster authored
    * rt/remove-hold-lockfile-for-append:
      lockfile: remove function "hold_lock_file_for_append"
  4. @gitster

    Merge branch 'rs/archive-zip-many'

    gitster authored
    "git archive" did not use zip64 extension when creating an archive
    with more than 64k entries, which nobody should need, right ;-)?
    
    * rs/archive-zip-many:
      archive-zip: support more than 65535 entries
      archive-zip: use a local variable to store the creator version
      t5004: test ZIP archives with many entries
  5. @gitster

    Merge branch 'ls/p4-fold-case-client-specs'

    gitster authored
    On case insensitive systems, "git p4" did not work well with client
    specs.
    
    * ls/p4-fold-case-client-specs:
      git-p4: honor core.ignorecase when using P4 client specs
  6. @gitster

    Merge branch 'ah/submodule-typofix-in-error'

    gitster authored
    Error string fix.
    
    * ah/submodule-typofix-in-error:
      git-submodule: remove extraneous space from error message
  7. @gitster

    Merge branch 'ah/reflog-typofix-in-error'

    gitster authored
    Error string fix.
    
    * ah/reflog-typofix-in-error:
      reflog: add missing single quote to error message
  8. @gitster

    Merge branch 'ah/read-tree-usage-string'

    gitster authored
    Usage string fix.
    
    * ah/read-tree-usage-string:
      read-tree: replace bracket set with parentheses to clarify usage
  9. @gitster

    Merge branch 'ah/pack-objects-usage-strings'

    gitster authored
    Usage string fix.
    
    * ah/pack-objects-usage-strings:
      pack-objects: place angle brackets around placeholders in usage strings
  10. @gitster

    Merge branch 'br/svn-doc-include-paths-config'

    gitster authored
    * br/svn-doc-include-paths-config:
      git-svn doc: mention "svn-remote.<name>.include-paths"
  11. @gitster

    Merge branch 'nd/fixup-linked-gitdir'

    gitster authored
    The code in "multiple-worktree" support that attempted to recover
    from an inconsistent state updated an incorrect file.
    
    * nd/fixup-linked-gitdir:
      setup: update the right file in multiple checkouts
Commits on Aug 31, 2015
  1. @gitster

    Eighth batch for 2.6

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

    Merge branch 'sg/describe-contains'

    gitster authored
    "git describe" without argument defaulted to describe the HEAD
    commit, but "git describe --contains" didn't.  Arguably, in a
    repository used for active development, such defaulting would not
    be very useful as the tip of branch is typically not tagged, but it
    is better to be consistent.
    
    * sg/describe-contains:
      describe --contains: default to HEAD when no commit-ish is given
  3. @gitster

    Merge branch 'db/push-sign-if-asked'

    gitster authored
    The client side codepaths in "git push" have been cleaned up
    and the user can request to perform an optional "signed push",
    i.e. sign only when the other end accepts signed push.
    
    * db/push-sign-if-asked:
      push: add a config option push.gpgSign for default signed pushes
      push: support signing pushes iff the server supports it
      builtin/send-pack.c: use parse_options API
      config.c: rename git_config_maybe_bool_text and export it as git_parse_maybe_bool
      transport: remove git_transport_options.push_cert
      gitremote-helpers.txt: document pushcert option
      Documentation/git-send-pack.txt: document --signed
      Documentation/git-send-pack.txt: wrap long synopsis line
      Documentation/git-push.txt: document when --signed may fail
  4. @gitster

    Merge branch 'jk/notes-merge-config'

    gitster authored
    "git notes merge" can be told with "--strategy=<how>" option how to
    automatically handle conflicts; this can now be configured by
    setting notes.mergeStrategy configuration variable.
    
    * jk/notes-merge-config:
      notes: teach git-notes about notes.<name>.mergeStrategy option
      notes: add notes.mergeStrategy option to select default strategy
      notes: add tests for --commit/--abort/--strategy exclusivity
      notes: extract parse_notes_merge_strategy to notes-utils
      notes: extract enum notes_merge_strategy to notes-utils.h
      notes: document cat_sort_uniq rewriteMode
  5. @gitster

    Merge branch 'jc/am-state-fix'

    gitster authored
    Recent reimplementation of "git am" changed the format of state
    files kept in $GIT_DIR/rebase-apply/ without meaning to do so,
    primarily because write_file() API was cumbersome to use and it was
    easy to mistakenly make text files with incomplete lines.  Update
    write_file() interface to make it harder to misuse.
    
    * jc/am-state-fix:
      write_file(): drop caller-supplied LF from calls to create a one-liner file
      write_file_v(): do not leave incomplete line at the end
      write_file(): drop "fatal" parameter
      builtin/am: make sure state files are text
      builtin/am: introduce write_state_*() helper functions
  6. @gitster

    Merge branch 'jc/log-p-cc'

    gitster authored
    "git log --cc" did not show any patch, even though most of the time
    the user meant "git log --cc -p -m" to see patch output for commits
    with a single parent, and combined diff for merge commits.  The
    command is taught to DWIM "--cc" (without "--raw" and other forms
    of output specification) to "--cc -p -m".
    
    * jc/log-p-cc:
      builtin/log.c: minor reformat
      log: show merge commit when --cc is given
      log: when --cc is given, default to -p unless told otherwise
      log: rename "tweak" helpers
  7. @gitster

    Merge branch 'jk/fix-alias-pager-config-key-warnings'

    gitster authored
    Because the configuration system does not allow "alias.0foo" and
    "pager.0foo" as the configuration key, the user cannot use '0foo'
    as a custom command name anyway, but "git 0foo" tried to look these
    keys up and emitted useless warnings before saying '0foo is not a
    git command'.  These warning messages have been squelched.
    
    * jk/fix-alias-pager-config-key-warnings:
      config: silence warnings for command names with invalid keys
  8. @gitster

    Merge branch 'jk/rev-list-has-no-notes'

    gitster authored
    "git rev-list" does not take "--notes" option, but did not complain
    when one is given.
    
    * jk/rev-list-has-no-notes:
      rev-list: make it obvious that we do not support notes
  9. @gitster

    Merge branch 'hv/submodule-config'

    gitster authored
    The gitmodules API accessed from the C code learned to cache stuff
    lazily.
    
    * hv/submodule-config:
      submodule: allow erroneous values for the fetchRecurseSubmodules option
      submodule: use new config API for worktree configurations
      submodule: extract functions for config set and lookup
      submodule: implement a config API for lookup of .gitmodules values
  10. @gitster

    Merge branch 'sg/config-name-only'

    gitster authored
    "git config --list" output was hard to parse when values consist of
    multiple lines.  "--name-only" option is added to help this.
    
    * sg/config-name-only:
      get_urlmatch: avoid useless strbuf write
      format_config: simplify buffer handling
      format_config: don't init strbuf
      config: restructure format_config() for better control flow
      completion: list variable names reliably with 'git config --name-only'
      config: add '--name-only' option to list only variable names
  11. @dturner-tw @gitster

    commit: don't rewrite shared index unnecessarily

    dturner-tw authored gitster committed
    Remove a cache invalidation which would cause the shared index to be
    rewritten on as-is commits.
    
    When the cache-tree has changed, we need to update it.  But we don't
    necessarily need to update the shared index.  So setting
    active_cache_changed to SOMETHING_CHANGED is unnecessary.  Instead, we
    let update_main_cache_tree just update the CACHE_TREE_CHANGED bit.
    
    In order to test this, make test-dump-split-index not segfault on
    missing replace_bitmap/delete_bitmap.  This new codepath is not called
    now that the test passes, but is necessary to avoid a segfault when the
    new test is run with the old builtin/commit.c code.
    
    Signed-off-by: David Turner <dturner@twopensource.com>
    Acked-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Aug 28, 2015
  1. @gitster

    Sync with 2.5.1

    gitster authored
  2. @gitster

    Seventh batch for 2.6

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

    Merge branch 'cc/trailers-corner-case-fix'

    gitster authored
    "interpret-trailers" helper mistook a single-liner log message that
    has a colon as the end of existing trailer.
    
    * cc/trailers-corner-case-fix:
      trailer: retitle a test and correct an in-comment message
      trailer: ignore first line of message
  4. @gitster

    Merge branch 'dt/untracked-subdir'

    gitster authored
    The experimental untracked-cache feature were buggy when paths with
    a few levels of subdirectories are involved.
    
    * dt/untracked-subdir:
      untracked cache: fix entry invalidation
      untracked-cache: fix subdirectory handling
  5. @alexhenrie @gitster

    read-tree: replace bracket set with parentheses to clarify usage

    alexhenrie authored gitster committed
    -u and -i can only be given if -m, --reset, or --prefix is given.
    Without parentheses, it looks like -u and -i can be used no matter
    what, and the second pair of brackets is confusing.
    
    Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  6. @alexhenrie @gitster

    pack-objects: place angle brackets around placeholders in usage strings

    alexhenrie authored gitster committed
    Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  7. @alexhenrie @gitster

    git-submodule: remove extraneous space from error message

    alexhenrie authored gitster committed
    Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
    Acked-by: Chris Packham <judge.packham@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  8. @gitster

    lockfile: remove function "hold_lock_file_for_append"

    Ralf Thielow authored gitster committed
    With 77b9b1d (add_to_alternates_file: don't add duplicate entries,
    2015-08-10) the last caller of function "hold_lock_file_for_append"
    has been removed, so we can remove the function as well.
    
    Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
    Acked-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  9. @gitster

    Git 2.5.1

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

    Mingw: verify both ends of the pipe () call

    jfmc authored gitster committed
    The code to open and test the second end of the pipe clearly imitates
    the code for the first end. A little too closely, though... Let's fix
    the obvious copy-edit bug.
    
    Signed-off-by: Jose F. Morales <jfmcjf@gmail.com>
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
    Acked-by: Johannes Sixt <j6t@kdbg.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  11. @larsxschneider @gitster

    git-p4: honor core.ignorecase when using P4 client specs

    larsxschneider authored gitster committed
    Perforce depot may record paths in mixed cases, e.g. "p4 files" may
    show that there are these two paths:
    
       //depot/Path/to/file1
       //depot/pATH/to/file2
    
    and with "p4" or "p4v", these end up in the same directory, e.g.
    
       //depot/Path/to/file1
       //depot/Path/to/file2
    
    which is the desired outcome on case insensitive systems.
    
    If git-p4 is used with client spec "//depot/Path/...", however, then
    all files not matching the case in the client spec are ignored (in
    the example above "//depot/pATH/to/file2").
    
    Fix this by using the path case that appears first in lexicographical
    order when core.ignorecase is set to true. This behavior is consistent
    with "p4" and "p4v".
    
    Signed-off-by: Lars Schneider <larsxschneider@gmail.com>
    Acked-by: Luke Diamand <luke@diamand.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  12. @alexhenrie @gitster

    reflog: add missing single quote to error message

    alexhenrie authored gitster committed
    The error message can be seen by running
    `git config gc.reflogexpire foo` and then `git reflog expire`.
    
    Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  13. @gitster

    archive-zip: support more than 65535 entries

    René Scharfe authored gitster committed
    Support more than 65535 entries cleanly by writing a "zip64 end of
    central directory record" (with a 64-bit field for the number of
    entries) before the usual "end of central directory record" (which
    contains only a 16-bit field).  InfoZIP's zip does the same.
    Archives with 65535 or less entries are not affected.
    
    Programs that extract all files like InfoZIP's zip and 7-Zip
    ignored the field and could extract all files already.  Software
    that relies on the ZIP file directory to show a list of contained
    files quickly to simulate to normal directory like Windows'
    built-in ZIP functionality only saw a subset of the included files.
    
    Windows supports ZIP64 since Vista according to
    https://en.wikipedia.org/wiki/Zip_%28file_format%29#ZIP64.
    
    Suggested-by: Johannes Schauer <josch@debian.org>
    Signed-off-by: Rene Scharfe <l.s.r@web.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Something went wrong with that request. Please try again.