Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on Apr 27, 2015
  1. @gitster

    Sync with master

    gitster authored
    * master:
      Git 2.3.7
  2. @gitster

    Sync with 2.3.7

    gitster authored
  3. @gitster

    Git 2.3.7

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

    Merge branch 'tb/connect-ipv6-parse-fix' into maint

    gitster authored
    An earlier update to the parser that disects a URL broke an
    address, followed by a colon, followed by an empty string (instead
    of the port number), e.g. ssh://example.com:/path/to/repo.
    
    * tb/connect-ipv6-parse-fix:
      connect.c: ignore extra colon after hostname
  5. @gitster

    Merge branch 'ma/bash-completion-leaking-x' into maint

    gitster authored
    The completion script (in contrib/) contaminated global namespace
    and clobbered on a shell variable $x.
    
    * ma/bash-completion-leaking-x:
      completion: fix global bash variable leak on __gitcompappend
  6. @gitster

    Merge branch 'jc/push-cert' into maint

    gitster authored
    The "git push --signed" protocol extension did not limit what the
    "nonce" that is a server-chosen string can contain or how long it
    can be, which was unnecessarily lax.  Limit both the length and the
    alphabet to a reasonably small space that can still have enough
    entropy.
    
    * jc/push-cert:
      push --signed: tighten what the receiving end can ask to sign
Commits on Apr 26, 2015
  1. @gitster

    Merge branch 'nd/versioncmp-prereleases' into next

    gitster authored
    * nd/versioncmp-prereleases:
      git tag: mention versionsort.prereleaseSuffix in manpage
  2. @gitster

    Merge branch 'mg/status-v-v' into next

    gitster authored
    * mg/status-v-v:
      status: document the -v/--verbose option
Commits on Apr 24, 2015
  1. @mhagger @gitster

    status: document the -v/--verbose option

    mhagger authored gitster committed
    Document `git status -v`, including its new doubled `-vv` form.
    
    Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Apr 23, 2015
  1. @gitster

    Sync with master

    gitster authored
    * master:
      RelNotes: wordsmithing
      RelNotes: refer to the rebase -i "todo list", not "insn sheet"
      RelNotes: correct name of versionsort.prereleaseSuffix
  2. @gitster

    Merge branch 'va/p4-client-path' into next

    gitster authored
    git p4 attempts to better handle branches in Perforce.
    
    * va/p4-client-path:
      git-p4: improve client path detection when branches are used
      t9801: check git-p4's branch detection with client spec enabled
  3. @gitster

    Merge branch 'mm/add-p-split-error' into next

    gitster authored
    When "add--interactive" splits a hunk into two overlapping hunks
    and then let the user choose only one, it sometimes feeds an
    incorrect patch text to "git apply".  Add tests to demonstrate
    this.
    
    I have a slight suspicion that this may be $gmane/87202 coming back
    and biting us (I seem to have said "let's run with this and see
    what happens" back then).
    
    * mm/add-p-split-error:
      stash -p: demonstrate failure of split with mixed y/n
      t3904-stash-patch: factor PERL prereq at the top of the file
      t3904-stash-patch: fix test description
      add -p: demonstrate failure when running 'edit' after a split
      t3701-add-interactive: simplify code
  4. @mhagger @gitster

    RelNotes: wordsmithing

    mhagger authored gitster committed
    Make many textual tweaks to the 2.4.0 release notes.
    
    Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  5. @mhagger @gitster

    RelNotes: refer to the rebase -i "todo list", not "insn sheet"

    mhagger authored gitster committed
    "Todo list" is the name that is used in the user-facing documentation.
    
    Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  6. @mhagger @gitster

    RelNotes: correct name of versionsort.prereleaseSuffix

    mhagger authored gitster committed
    Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  7. @mhagger @gitster

    git tag: mention versionsort.prereleaseSuffix in manpage

    mhagger authored gitster committed
    Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  8. @vhda @gitster

    git-p4: improve client path detection when branches are used

    vhda authored gitster committed
    Perforce allows client side file/directory remapping through
    the use of the client view definition that is part of the
    user's client spec.
    
    To support this functionality while branch detection is
    enabled it is important to determine the branch location in
    the workspace such that the correct files are patched before
    Perforce submission. Perforce provides a command that
    facilitates this process: p4 where.
    
    This patch does two things to fix improve file location
    detection when git-p4 has branch detection and use of client
    spec enabled:
    
     1. Enable usage of "p4 where" when Perforce branches exist
        in the git repository, even when client specification is
        used. This makes use of the already existing function
        p4Where.
    
     2. Allow identifying partial matches of the branch's depot
        path while processing the output of "p4 where". For
        robustness, paths will only match if ending in "/...".
    
    Signed-off-by: Vitor Antunes <vitor.hda@gmail.com>
    Acked-by: Luke Diamand <luke@diamand.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Apr 22, 2015
  1. @gitster

    Sync with 2.4.0-rc3

    gitster authored
    * master:
      Git 2.4.0-rc3
  2. @gitster

    Git 2.4.0-rc3

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

    t9801: check git-p4's branch detection with client spec enabled

    vhda authored gitster committed
    Add failing scenario when branch detection (--detect-branches) is
    enabled together with use client spec (--use-client-spec). In this
    specific scenario git-p4 will break when the Perforce client view
    removes part of the depot path, as in the following example:
    
      //depot/branch1/base/... //client/branch1/...
    
    The test case also includes an extra sub-file mapping to enforce
    robustness check of git-p4's client view support:
    
      //depot/branch1/base/dir/sub_file1 //client/branch1/sub_file1
    
    Signed-off-by: Vitor Antunes <vitor.hda@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Apr 21, 2015
  1. @gitster

    Sync with master

    gitster authored
    * master:
      Git 2.3.6
      RelNotes: "merge --quiet" change has been reverted
  2. @gitster

    Merge branch 'jk/prune-mtime' into next

    gitster authored
    Access to objects in repositories that borrow from another one on a
    slow NFS server unnecessarily got more expensive due to recent code
    becoming more cautious in a naive way not to lose objects to pruning.
    
    * jk/prune-mtime:
      sha1_file: only freshen packs once per run
      sha1_file: freshen pack objects before loose
      reachable: only mark local objects as recent
  3. @gitster

    Merge branch 'mm/usage-log-l-can-take-regex' into next

    gitster authored
    * mm/usage-log-l-can-take-regex:
      log -L: improve error message on malformed argument
      Documentation: change -L:<regex> to -L:<funcname>
  4. @gitster

    Merge branch 'ls/p4-changes-block-size' into next

    gitster authored
    "git p4" learned "--changes-block-size <n>" to read the changes in
    chunks from Perforce, instead of making one call to "p4 changes"
    that may trigger "too many rows scanned" error from Perforce.
    
    * ls/p4-changes-block-size:
      git-p4: use -m when running p4 changes
  5. @gitster

    Merge branch 'jc/plug-fmt-merge-msg-leak' into next

    gitster authored
    * jc/plug-fmt-merge-msg-leak:
      fmt-merge-msg: plug small leak of commit buffer
  6. @gitster

    Merge branch 'nd/slim-index-pack-memory-usage' into next

    gitster authored
    Memory usage of "git index-pack" has been trimmed by tens of
    per-cent.
    
    * nd/slim-index-pack-memory-usage:
      index-pack: kill union delta_base to save memory
      index-pack: reduce object_entry size to save memory
  7. @gitster

    Merge branch 'tb/t0027-crlf' into next

    gitster authored
    * tb/t0027-crlf:
      t0027: support NATIVE_CRLF platforms
      t0027: cleanup: rename functions; avoid non-leading TABs
  8. @gitster

    Merge branch 'nd/t1509-chroot-test' into next

    gitster authored
    Correct test bitrot.
    
    * nd/t1509-chroot-test:
      t1509: update prepare script to be able to run t1509 in chroot again
  9. @gitster

    Merge branch 'jk/still-interesting' into next

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

    Merge branch 'jk/reading-packed-refs' into next

    gitster authored
    An earlier rewrite to use strbuf_getwholeline() instead of fgets(3)
    to read packed-refs file revealed that the former is unacceptably
    inefficient.
    
    * jk/reading-packed-refs:
      t1430: add another refs-escape test
      read_packed_refs: avoid double-checking sane refs
      strbuf_getwholeline: use getdelim if it is available
      strbuf_getwholeline: avoid calling strbuf_grow
      strbuf_addch: avoid calling strbuf_grow
      config: use getc_unlocked when reading from file
      strbuf_getwholeline: use getc_unlocked
      git-compat-util: add fallbacks for unlocked stdio
      strbuf_getwholeline: use getc macro
  11. @gitster

    Merge branch 'ep/fix-test-lib-functions-report' into next

    gitster authored
    * ep/fix-test-lib-functions-report:
      test-lib-functions.sh: fix the second argument to some helper functions
  12. @gitster

    Merge branch 'cn/bom-in-gitignore' into next

    gitster authored
    Teach the codepaths that read .gitignore and .gitattributes files
    that these files encoded in UTF-8 may have UTF-8 BOM marker at the
    beginning; this makes it in line with what we do for configuration
    files already.
    
    * cn/bom-in-gitignore:
      attr: skip UTF8 BOM at the beginning of the input file
      config: use utf8_bom[] from utf.[ch] in git_parse_source()
      utf8-bom: introduce skip_utf8_bom() helper
      add_excludes_from_file: clarify the bom skipping logic
      dir: allow a BOM at the beginning of exclude files
  13. @gitster

    Merge branch 'lm/squelch-bg-progress' into next

    gitster authored
    Many long-running operations show progress eye-candy, even when
    they are later backgrounded.  Hide the eye-candy when the process
    is sent to the background instead.
    
    * lm/squelch-bg-progress:
      compat/mingw: stubs for getpgid() and tcgetpgrp()
      progress: no progress in background
  14. @gitster

    Merge branch 'jc/epochtime-wo-tz' into next

    gitster authored
    "git commit --date=now" or anything that relies on approxidate lost
    the daylight-saving-time offset.
    
    * jc/epochtime-wo-tz:
      parse_date_basic(): let the system handle DST conversion
      parse_date_basic(): return early when given a bogus timestamp
  15. @gitster

    Merge branch 'jk/sha1-file-reduce-useless-warnings' into next

    gitster authored
    * jk/sha1-file-reduce-useless-warnings:
      sha1_file: squelch "packfile cannot be accessed" warnings
Something went wrong with that request. Please try again.