Skip to content
Commits on Feb 17, 2013
  1. @gitster

    Git 1.8.2-rc0

    gitster committed Feb 17, 2013
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @gitster

    Merge branch 'jc/hidden-refs'

    gitster committed Feb 17, 2013
    Allow the server side to redact the refs/ namespace it shows to the
    client.
    
    Will merge to 'master'.
    
    * jc/hidden-refs:
      upload/receive-pack: allow hiding ref hierarchies
      upload-pack: simplify request validation
      upload-pack: share more code
  3. @gitster

    Merge branch 'mp/diff-algo-config'

    gitster committed Feb 17, 2013
    Add diff.algorithm configuration so that the user does not type
    "diff --histogram".
    
    * mp/diff-algo-config:
      diff: Introduce --diff-algorithm command line option
      config: Introduce diff.algorithm variable
      git-completion.bash: Autocomplete --minimal and --histogram for git-diff
  4. @gitster

    Merge branch 'mw/bash-prompt-show-untracked-config'

    gitster committed Feb 17, 2013
    Allows skipping the untracked check GIT_PS1_SHOWUNTRACKEDFILES
    asks for the git-prompt (in contrib/) per repository.
    
    * mw/bash-prompt-show-untracked-config:
      t9903: add extra tests for bash.showDirtyState
      t9903: add tests for bash.showUntrackedFiles
      shell prompt: add bash.showUntrackedFiles option
  5. @gitster

    Merge branch 'jk/rebase-i-comment-char'

    gitster committed Feb 17, 2013
    Finishing touches to the earlier core.commentchar topic to cover
    "rebase -i" as well.
    
    * jk/rebase-i-comment-char:
      rebase -i: respect core.commentchar
  6. @gitster

    Merge branch 'jk/read-commit-buffer-data-after-free'

    gitster committed Feb 17, 2013
    "git log --grep=<pattern>" used to look for the pattern in literal
    bytes of the commit log message and ignored the log-output encoding.
    
    * jk/read-commit-buffer-data-after-free:
      log: re-encode commit messages before grepping
Commits on Feb 15, 2013
  1. @gitster

    Update draft release notes to 1.8.2

    gitster committed Feb 15, 2013
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @gitster

    Merge branch 'wk/man-deny-current-branch-is-default-these-days'

    gitster committed Feb 14, 2013
    * wk/man-deny-current-branch-is-default-these-days:
      user-manual: Update for receive.denyCurrentBranch=refuse
  3. @gitster

    Merge branch 'mk/make-rm-depdirs-could-be-empty'

    gitster committed Feb 14, 2013
    "make COMPUTE_HEADER_DEPENDENCIES=no clean" would try to run "rm
    -rf $(dep_dirs)" with an empty dep_dir, but some implementations of
    "rm -rf" barf on an empty argument list.
    
    * mk/make-rm-depdirs-could-be-empty:
      Makefile: don't run "rm" without any files
  4. @gitster

    Merge branch 'mm/config-local-completion'

    gitster committed Feb 14, 2013
    * mm/config-local-completion:
      completion: support 'git config --local'
  5. @gitster

    Merge branch 'ef/non-ascii-parse-options-error-diag'

    gitster committed Feb 14, 2013
    * ef/non-ascii-parse-options-error-diag:
      parse-options: report uncorrupted multi-byte options
  6. @gitster

    Merge branch 'mk/old-expat'

    gitster committed Feb 14, 2013
    * mk/old-expat:
      Allow building with xmlparse.h
  7. @gitster

    Merge branch 'da/p4merge-mktemp-fix'

    gitster committed Feb 14, 2013
    * da/p4merge-mktemp-fix:
      p4merge: fix printf usage
Commits on Feb 14, 2013
  1. @gitster

    Documentation/git-add: kill remaining <filepattern>

    gitster committed Feb 14, 2013
    The merge at 5bf72ed missed another instance of <filepattern> that
    we were converting to <pathspec>.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @wking @gitster

    user-manual: Update for receive.denyCurrentBranch=refuse

    wking committed with gitster Feb 8, 2013
    acd2a45 (Refuse updating the current branch in a non-bare repository
    via push, 2009-02-11) changed the default to refuse such a push, but
    it forgot to update the docs.
    
    7d182f5 (Documentation: receive.denyCurrentBranch defaults to
    'refuse', 2010-03-17) updated Documentation/config.txt, but forgot to
    update the user manual.
    
    Signed-off-by: W. Trevor King <wking@tremily.us>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. @gitster

    Update draft release notes to 1.8.2

    gitster committed Feb 14, 2013
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. @gitster

    Merge branch 'jk/diff-graph-cleanup'

    gitster committed Feb 14, 2013
    Refactors a lot of repetitive code sequence from the graph drawing
    code and adds it to the combined diff output.
    
    * jk/diff-graph-cleanup:
      combine-diff.c: teach combined diffs about line prefix
      diff.c: use diff_line_prefix() where applicable
      diff: add diff_line_prefix function
      diff.c: make constant string arguments const
      diff: write prefix to the correct file
      graph: output padding for merge subsequent parents
  5. @gitster

    Merge branch 'nd/status-show-in-progress'

    gitster committed Feb 14, 2013
    * nd/status-show-in-progress:
      status: show the branch name if possible in in-progress info
  6. @gitster

    Merge branch 'mm/remote-mediawiki-build'

    gitster committed Feb 14, 2013
    * mm/remote-mediawiki-build:
      git-remote-mediawiki: use toplevel's Makefile
      Makefile: make script-related rules usable from subdirectories
  7. @gitster

    Merge branch 'bw/get-tz-offset-perl'

    gitster committed Feb 14, 2013
    * bw/get-tz-offset-perl:
      cvsimport: format commit timestamp ourselves without using strftime
      perl/Git.pm: fix get_tz_offset to properly handle DST boundary cases
      Move Git::SVN::get_tz to Git::get_tz_offset
  8. @gitster

    Merge branch 'al/mergetool-printf-fix'

    gitster committed Feb 14, 2013
    * al/mergetool-printf-fix:
      difftool--helper: fix printf usage
      git-mergetool: print filename when it contains %
  9. @gitster

    Merge branch 'jk/error-const-return'

    gitster committed Feb 14, 2013
    * jk/error-const-return:
      Use __VA_ARGS__ for all of error's arguments
  10. @gitster

    Merge branch 'jx/utf8-printf-width'

    gitster committed Feb 14, 2013
    Use a new helper that prints a message and counts its display width
    to align the help messages parse-options produces.
    
    * jx/utf8-printf-width:
      Add utf8_fprintf helper that returns correct number of columns
  11. @gitster

    Merge branch 'mg/bisect-doc'

    gitster committed Feb 14, 2013
    * mg/bisect-doc:
      git-bisect.txt: clarify that reset quits bisect
  12. @gitster

    Merge branch 'tz/perl-styles'

    gitster committed Feb 14, 2013
    Add coding guidelines for writing Perl scripts for Git.
    
    * tz/perl-styles:
      Update CodingGuidelines for Perl
  13. @gitster

    Merge branch 'jc/extended-fake-ancestor-for-gitlink'

    gitster committed Feb 14, 2013
    Instead of requiring the full 40-hex object names on the index
    line, we can read submodule commit object names from the textual
    diff when synthesizing a fake ancestore tree for "git am -3".
    
    * jc/extended-fake-ancestor-for-gitlink:
      apply: verify submodule commit object name better
  14. @gitster

    Merge branch 'dg/subtree-fixes'

    gitster committed Feb 14, 2013
    contrib/subtree updates, but here are only the ones that looked
    ready.  The remainder of the patches will have another day.
    
    * dg/subtree-fixes:
      contrib/subtree: make the manual directory if needed
      contrib/subtree: honor DESTDIR
      contrib/subtree: fix synopsis
      contrib/subtree: better error handling for 'subtree add'
      contrib/subtree: use %B for split subject/body
      contrib/subtree: remove test number comments
Commits on Feb 13, 2013
  1. @ienorand @gitster

    t9903: add extra tests for bash.showDirtyState

    ienorand committed with gitster Feb 13, 2013
    Add 3 extra tests for the bash.showDirtyState config option; the
    tests now cover all combinations of the shell var being set/unset
    and the config option being missing/enabled/disabled, given a dirty
    file.
    
    Signed-off-by: Martin Erik Werner <martinerikwerner@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @ienorand @gitster

    t9903: add tests for bash.showUntrackedFiles

    ienorand committed with gitster Feb 13, 2013
    Add 4 tests for the bash.showUntrackedFiles config option, covering
    all combinations of the shell var being set/unset and the config
    option being enabled/disabled (the other 2 cases, missing config
    with and without shell variable, are already covered by existing
    tests).
    
    Signed-off-by: Martin Erik Werner <martinerikwerner@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. @kraai @gitster

    Makefile: don't run "rm" without any files

    kraai committed with gitster Feb 13, 2013
    When COMPUTE_HEADER_DEPENDENCIES is set to "auto" and the compiler
    does not support it, $(dep_dirs) becomes empty.  "make clean" runs
    "rm -rf $(dep_dirs)", which can fail in such a case.
    
    Signed-off-by: Matt Kraai <matt.kraai@amo.abbott.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. @ienorand @gitster

    shell prompt: add bash.showUntrackedFiles option

    ienorand committed with gitster Feb 13, 2013
    Add a config option 'bash.showUntrackedFiles' which allows enabling
    the prompt showing untracked files on a per-repository basis. This is
    useful for some repositories where the 'git ls-files ...' command may
    take a long time.
    
    Signed-off-by: Martin Erik Werner <martinerikwerner@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Feb 12, 2013
  1. @gitster

    Merge branch 'maint'

    gitster committed Feb 12, 2013
    * maint:
      Replace filepattern with pathspec for consistency
  2. @johnkeeping @gitster

    rebase -i: respect core.commentchar

    johnkeeping committed with gitster Feb 11, 2013
    Commit eff80a9 (Allow custom "comment char") introduced a custom comment
    character for commit messages but did not teach git-rebase--interactive
    to use it.
    
    Change git-rebase--interactive to read core.commentchar and use its
    value when generating commit messages and for the command list.
    
    Signed-off-by: John Keeping <john@keeping.me.uk>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. @johnkeeping @gitster

    combine-diff.c: teach combined diffs about line prefix

    johnkeeping committed with gitster Feb 7, 2013
    When running "git log --graph --cc -p" the diff output for merges is not
    indented by the graph structure, unlike the diffs of non-merge commits
    (added in commit 7be5761 - diff.c: Output the text graph padding before
    each diff line).
    
    Fix this by teaching the combined diff code to output diff_line_prefix()
    before each line.
    
    Signed-off-by: John Keeping <john@keeping.me.uk>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. @johnkeeping @gitster

    diff.c: use diff_line_prefix() where applicable

    johnkeeping committed with gitster Feb 7, 2013
    Signed-off-by: John Keeping <john@keeping.me.uk>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Something went wrong with that request. Please try again.