Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
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
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. @gitster

    Git 2.5.1

    gitster authored
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  6. @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>
Commits on Aug 26, 2015
  1. @gitster

    Sixth batch for 2.6

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

    Merge branch 'sg/help-group'

    gitster authored
    We rewrote one of the build scripts in Perl but this reimplements
    in Bourne shell.
    
    * sg/help-group:
      generate-cmdlist: re-implement as shell script
  3. @gitster

    Merge branch 'sg/wt-status-header-inclusion'

    gitster authored
    * sg/wt-status-header-inclusion:
      wt-status: move #include "pathspec.h" to the header
  4. @gitster

    Merge branch 'as/docfix-reflog-expire-unreachable'

    gitster authored
    * as/docfix-reflog-expire-unreachable:
      Documentation/config: fix inconsistent label on gc.*.reflogExpireUnreachable
  5. @gitster

    Merge branch 'sg/t3020-typofix'

    gitster authored
    * sg/t3020-typofix:
      t3020: fix typo in test description
  6. @gitster

    Merge branch 'jc/calloc-pathspec'

    gitster authored
    * jc/calloc-pathspec:
      ps_matched: xcalloc() takes nmemb and then element size
  7. @gitster

    Merge branch 'dt/untracked-sparse'

    gitster authored
    Test update.
    
    * dt/untracked-sparse:
      t7063: use --force-untracked-cache to speed up a bit
  8. @gitster

    Merge branch 'pt/am-builtin'

    gitster authored
    Rewrite "am" in "C".
    
    * pt/am-builtin:
      i18n: am: fix typo in description of -b option
  9. @gitster

    Merge branch 'pt/am-builtin-abort-fix'

    gitster authored
    "git am" that was recently reimplemented in C had a performance
    regression in "git am --abort" that goes back to the version before
    an attempted (and failed) patch application.
    
    * pt/am-builtin-abort-fix:
      am --skip/--abort: merge HEAD/ORIG_HEAD tree into index
  10. @gitster

    Merge branch 'po/po-readme'

    gitster authored
    * po/po-readme:
      po/README: Update directions for l10n contributors
  11. @gitster

    Merge branch 'jv/send-email-selective-smtp-auth'

    gitster authored
    "git send-email" learned a new option --smtp-auth to limit the SMTP
    AUTH mechanisms to be used to a subset of what the system library
    supports.
    
    * jv/send-email-selective-smtp-auth:
      send-email: provide whitelist of SMTP AUTH mechanisms
  12. @gitster

    Merge branch 'ep/http-configure-ssl-version'

    gitster authored
    A new configuration variable http.sslVersion can be used to specify
    what specific version of SSL/TLS to use to make a connection.
    
    * ep/http-configure-ssl-version:
      http: add support for specifying the SSL version
  13. @gitster

    Merge branch 'ss/fix-config-fd-leak'

    gitster authored
    * ss/fix-config-fd-leak:
      config: close config file handle in case of error
  14. @jiangxin @gitster

    i18n: am: fix typo in description of -b option

    jiangxin authored gitster committed
    Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  15. @gitster

    trailer: retitle a test and correct an in-comment message

    Christian Couder authored gitster committed
    Signed-off-by: Christian Couder <christian.couder@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Aug 25, 2015
  1. @gitster

    Sync with maint

    gitster authored
    * maint:
      pull: pass upload_pack only when it was given
  2. @gitster

    Merge branch 'jk/guess-repo-name-regression-fix' into maint

    gitster authored
    "git clone $URL" in recent releases of Git contains a regression in
    the code that invents a new repository name incorrectly based on
    the $URL.  This has been corrected.
    
    * jk/guess-repo-name-regression-fix:
      clone: use computed length in guess_dir_name
      clone: add tests for output directory
  3. @gitster

    Merge branch 'jk/test-with-x' into maint

    gitster authored
    Running tests with the "-x" option to make them verbose had some
    unpleasant interactions with other features of the test suite.
    
    * jk/test-with-x:
      test-lib: disable trace when test is not verbose
      test-lib: turn off "-x" tracing during chain-lint check
  4. @gitster

    Merge branch 'sb/check-return-from-read-ref' into maint

    gitster authored
    * sb/check-return-from-read-ref:
      transport-helper: die on errors reading refs.
Something went wrong with that request. Please try again.