Permalink
Commits on Nov 16, 2009
  1. Git 1.6.5.3

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Nov 16, 2009
  2. Merge branch 'bs/maint-pre-commit-hook-sample' into maint

    * bs/maint-pre-commit-hook-sample:
      pre-commit.sample: Diff against the empty tree when HEAD is invalid
    gitster committed Nov 16, 2009
  3. Merge branch 'jk/maint-add-p-empty' into maint

    * jk/maint-add-p-empty:
      add-interactive: handle deletion of empty files
    gitster committed Nov 16, 2009
  4. Merge branch 'js/maint-diff-color-words' into maint

    * js/maint-diff-color-words:
      diff --color-words: bit of clean-up
      diff --color-words -U0: fix the location of hunk headers
      t4034-diff-words: add a test for word diff without context
    
    Conflicts:
    	diff.c
    gitster committed Nov 16, 2009
  5. Merge branch 'tz/maint-rpm' into maint

    * tz/maint-rpm:
      Makefile: Ensure rpm packages can be read by older rpm versions
    gitster committed Nov 16, 2009
  6. Merge branch 'jk/maint-format-patch-p-suppress-stat' into maint

    * jk/maint-format-patch-p-suppress-stat:
      format-patch: make "-p" suppress diffstat
    gitster committed Nov 16, 2009
  7. Merge branch 'pb/maint-gitweb-blob-lineno' into maint

    * pb/maint-gitweb-blob-lineno:
      gitweb: Fix blob linenr links in pathinfo mode
    gitster committed Nov 16, 2009
  8. Merge branch 'jk/maint-1.6.3-ls-files-i' into maint

    * jk/maint-1.6.3-ls-files-i:
      ls-files: unbreak "ls-files -i"
    gitster committed Nov 16, 2009
  9. Merge branch 'vl/maint-openssl-signature-change' into maint

    * vl/maint-openssl-signature-change:
      imap-send.c: fix compiler warnings for OpenSSL 1.0
    gitster committed Nov 16, 2009
  10. Merge branch 'jk/maint-push-config' into maint

    * jk/maint-push-config:
      push: always load default config
    gitster committed Nov 16, 2009
  11. Merge branch 'sr/blame-incomplete' into maint

    * sr/blame-incomplete:
      blame: make sure that the last line ends in an LF
    gitster committed Nov 16, 2009
  12. Merge branch 'jc/maint-blank-at-eof' into maint

    * jc/maint-blank-at-eof:
      diff -B: colour whitespace errors
      diff.c: emit_add_line() takes only the rest of the line
      diff.c: split emit_line() from the first char and the rest of the line
      diff.c: shuffling code around
      diff --whitespace: fix blank lines at end
      core.whitespace: split trailing-space into blank-at-{eol,eof}
      diff --color: color blank-at-eof
      diff --whitespace=warn/error: fix blank-at-eof check
      diff --whitespace=warn/error: obey blank-at-eof
      diff.c: the builtin_diff() deals with only two-file comparison
      apply --whitespace: warn blank but not necessarily empty lines at EOF
      apply --whitespace=warn/error: diagnose blank at EOF
      apply.c: split check_whitespace() into two
      apply --whitespace=fix: detect new blank lines at eof correctly
      apply --whitespace=fix: fix handling of blank lines at the eof
    gitster committed Nov 16, 2009
  13. Merge branch 'jc/maint-1.6.3-graft-trailing-space' into maint

    * jc/maint-1.6.3-graft-trailing-space:
      info/grafts: allow trailing whitespaces at the end of line
    gitster committed Nov 16, 2009
  14. Merge branch 'tr/maint-roff-quote' into maint

    * tr/maint-roff-quote:
      Quote ' as \(aq in manpages
    gitster committed Nov 16, 2009
  15. Merge branch 'ja/fetch-doc' into maint

    * ja/fetch-doc:
      Documentation/merge-options.txt: order options in alphabetical groups
      Documentation/git-pull.txt: Add subtitles above included option files
      Documentation/fetch-options.txt: order options alphabetically
    gitster committed Nov 16, 2009
  16. Merge branch 'cb/doc-fetch-pull-merge' into maint

    * cb/doc-fetch-pull-merge:
      modernize fetch/merge/pull examples
    gitster committed Nov 16, 2009
  17. Merge branch 'jk/maint-cvsimport-pathname' into maint

    * jk/maint-cvsimport-pathname:
      cvsimport: fix relative argument filenames
    gitster committed Nov 16, 2009
  18. Merge branch 'jc/receive-pack-auto' into maint

    * jc/receive-pack-auto:
      receive-pack: run "gc --auto --quiet" and optionally "update-server-info"
      gc --auto --quiet: make the notice a bit less verboase
    gitster committed Nov 16, 2009
  19. Merge branch 'gb/maint-gitweb-esc-param' into maint

    * gb/maint-gitweb-esc-param:
      gitweb: fix esc_param
    gitster committed Nov 16, 2009
  20. Merge branch 'jn/gitweb-patch' into maint

    * jn/gitweb-patch:
      gitweb: Do not show 'patch' link for merge commits
    gitster committed Nov 16, 2009
Commits on Nov 14, 2009
  1. Makefile: Ensure rpm packages can be read by older rpm versions

    The kernel.org hosts where the packages are built are now using Fedora
    11, which defaults to sha256 for file digests instead of md5.  Older
    versions of rpm can not handle these packages.  Tell rpmbuild to use md5
    file digests for better compatibility.
    
    Signed-off-by: Todd Zullinger <tmz@pobox.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    tmzullinger committed with gitster Nov 11, 2009
  2. git-add.txt: fix formatting of --patch section

    Extra paragraphs should be prefixed with a plus sign.
    
    Signed-off-by: Stephen Boyd <bebarino@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    bebarino committed with gitster Nov 14, 2009
Commits on Nov 11, 2009
  1. check-ref-format -h: it does not know the --print option yet

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Nov 11, 2009
Commits on Nov 10, 2009
  1. merge: do not setup worktree twice

    Builtins do not need to run setup_worktree() for themselves, since
    the builtin machinery runs it for them.
    
    Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    jrn committed with gitster Nov 9, 2009
  2. check-ref-format: update usage string

    'git check-ref-format' has learned --branch and --print options
    since the usage string was last updated.
    
    Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    jrn committed with gitster Nov 9, 2009
Commits on Nov 9, 2009
  1. Add intermediate build products to .gitignore

    Temporaries such as configure.ac+ and Documentation/*.xml+
    sometimes remain after an interrupted build.  Tell git not to
    track them.
    
    Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    jrn committed with gitster Nov 8, 2009
  2. format-patch: make "-p" suppress diffstat

    Once upon a time, format-patch would use its default stat
    plus patch format only when no diff format was given on the
    command line. This meant that "format-patch -p" would
    suppress the stat and show just the patch.
    
    Commit 68daa64 changed this to keep the stat format when we
    had an "implicit" patch format, like "-U5". As a side
    effect, this meant that an explicit patch format was now
    ignored (because cmd_format_patch didn't know the reason
    that the format was set way down in diff_opt_parse).
    
    This patch unbreaks what 68daa64 did (while still preserving
    what 68daa64 was trying to do), reinstating "-p" to suppress
    the default behavior. We do this by parsing "-p" ourselves
    in format-patch, and noting whether it was used explicitly.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    peff committed with gitster Nov 4, 2009
Commits on Nov 7, 2009
  1. pre-commit.sample: Diff against the empty tree when HEAD is invalid

    This was already the case for the old "diff --check" call, but the new
    one that checks whether there are any non-ascii file names was missing
    it, making that check fail for root commits.
    
    Signed-off-by: Björn Steinbrink <B.Steinbrink@gmx.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    dotdash committed with gitster Nov 5, 2009
Commits on Nov 6, 2009
  1. gitweb: Fix blob linenr links in pathinfo mode

    In pathinfo mode, we use <base href> that refers to the base location
    of gitweb in order for various external media links to work well.
    However, this means that for the page to refer to itself, it must
    regenerate full link, and this is exactly what the blob view page
    did not do for line numbers.
    
    Signed-off-by: Petr Baudis <pasky@suse.cz>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Petr Baudis committed with gitster Nov 6, 2009
Commits on Nov 5, 2009
  1. Fix documentation grammar typo

    Introduced in 492cf3f (More precise description of 'git describe --abbrev', 2009-10-29)
    
    Signed-off-by: Gisle Aas <gisle@aas.no>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gisle committed with gitster Nov 4, 2009
Commits on Nov 4, 2009
  1. Allow curl helper to work without a local repository

    It's okay to use the curl helper without a local repository, so long
    as you don't use "fetch". There aren't any git programs that would try
    to use it, and it doesn't make sense to try it (since there's nowhere
    to write the results), but we may as well be clear.
    
    Signed-off-by: Daniel Barkalow <barkalow@iabervon.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Daniel Barkalow committed with gitster Nov 4, 2009
  2. Require a struct remote in transport_get()

    cmd_ls_remote() was calling transport_get() with a NULL remote and a
    non-NULL url in the case where it was run outside a git
    repository. This involved a bunch of ill-tested special
    cases. Instead, simply get the struct remote for the URL with
    remote_get(), which works fine outside a git repository, and can also
    take global options into account.
    
    This fixes a tiny and obscure bug where "git ls-remote" without a repo
    didn't support global url.*.insteadOf, even though "git clone" and
    "git ls-remote" in any repo did.
    
    Also, enforce that all callers provide a struct remote to transport_get().
    
    Signed-off-by: Daniel Barkalow <barkalow@iabervon.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Daniel Barkalow committed with gitster Nov 4, 2009
Commits on Nov 2, 2009
  1. Merge branch 'bg/clone-doc' into maint

    * bg/clone-doc:
      git-clone.txt: Fix grammar and formatting
    gitster committed Nov 2, 2009
  2. Makefile: add compat/bswap.h to LIB_H

    Starting with commit 51ea551,
    git-compat-util.h includes compat/bswap.h
    
    Signed-off-by: Dmitry V. Levin <ldv@altlinux.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    ldv-alt committed with gitster Nov 1, 2009
Commits on Oct 31, 2009
  1. imap-send.c: fix compiler warnings for OpenSSL 1.0

    The openssl/CHANGES file says:
    
        Let the TLSv1_method() etc. functions return a 'const' SSL_METHOD
        pointer and make the SSL_METHOD parameter in SSL_CTX_new,
        SSL_CTX_set_ssl_version and SSL_set_ssl_method 'const'.
    
    In older versions, unqualified pointers were used, so we unfortunately
    cannot unconditionally update the type of the variable we use.
    
    Signed-off-by: Vietor Liu <vietor@vxwo.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Vietor Liu committed with gitster Oct 31, 2009