Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Jan 06, 2012

  1. Junio C Hamano

    Merge branch 'jc/show-sig'

    * jc/show-sig:
      log --show-signature: reword the common two-head merge case
      log-tree: show mergetag in log --show-signature output
      log-tree.c: small refactor in show_signature()
      commit --amend -S: strip existing gpgsig headers
      verify_signed_buffer: fix stale comment
      gpg-interface: allow use of a custom GPG binary
      pretty: %G[?GS] placeholders
      test "commit -S" and "log --show-signature"
      log: --show-signature
      commit: teach --gpg-sign option
    
    Conflicts:
    	builtin/commit-tree.c
    	builtin/commit.c
    	builtin/merge.c
    	notes-cache.c
    	pretty.c
    gitster authored

Dec 15, 2011

  1. Nguyễn Thái Ngọc Duy

    Convert commit_tree() to take strbuf as message

    There wan't a way for commit_tree() to notice if the message the caller
    prepared contained a NUL byte, as it did not take the length of the
    message as a parameter. Use a pointer to a strbuf instead, so that we can
    either choose to allow low-level plumbing commands to make commits that
    contain NUL byte in its message, or forbid NUL everywhere by adding the
    check in commit_tree(), in later patches.
    
    Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    pclouds authored gitster committed

Nov 13, 2011

  1. Junio C Hamano

    commit: teach --gpg-sign option

    This uses the gpg-interface.[ch] to allow signing the commit, i.e.
    
        $ git commit --gpg-sign -m foo
        You need a passphrase to unlock the secret key for
        user: "Junio C Hamano <gitster@pobox.com>"
        4096-bit RSA key, ID 96AFE6CB, created 2011-10-03 (main key ID 713660A7)
    
        [master 8457d13] foo
         1 files changed, 1 insertions(+), 0 deletions(-)
    
    The lines of GPG detached signature are placed in a new multi-line header
    field, instead of tucking the signature block at the end of the commit log
    message text (similar to how signed tag is done), for multiple reasons:
    
     - The signature won't clutter output from "git log" and friends if it is
       in the extra header. If we place it at the end of the log message, we
       would need to teach "git log" and friends to strip the signature block
       with an option.
    
     - Teaching new versions of "git log" and "gitk" to optionally verify and
       show signatures is cleaner if we structurally know where the signature
       block is (instead of scanning in the commit log message).
    
     - The signature needs to be stripped upon various commit rewriting
       operations, e.g. rebase, filter-branch, etc. They all already ignore
       unknown headers, but if we place signature in the log message, all of
       these tools (and third-party tools) also need to learn how a signature
       block would look like.
    
     - When we added the optional encoding header, all the tools (both in tree
       and third-party) that acts on the raw commit object should have been
       fixed to ignore headers they do not understand, so it is not like that
       new header would be more likely to break than extra text in the commit.
    
    A commit made with the above sample sequence would look like this:
    
        $ git cat-file commit HEAD
        tree 3cd71d9
        parent b877553
        author Junio C Hamano <gitster@pobox.com> 1317862251 -0700
        committer Junio C Hamano <gitster@pobox.com> 1317862251 -0700
        gpgsig -----BEGIN PGP SIGNATURE-----
         Version: GnuPG v1.4.10 (GNU/Linux)
    
         iQIcBAABAgAGBQJOjPtrAAoJELC16IaWr+bL4TMP/RSe2Y/jYnCkds9unO5JEnfG
         ...
         =dt98
         -----END PGP SIGNATURE-----
    
        foo
    
    but "git log" (unless you ask for it with --pretty=raw) output is not
    cluttered with the signature information.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster authored

Nov 17, 2010

  1. Johan Herland

    notes.h/c: Propagate combine_notes_fn return value to add_note() and …

    …beyond
    
    The combine_notes_fn functions uses a non-zero return value to indicate
    failure. However, this return value was converted to a call to die()
    in note_tree_insert().
    
    Instead, propagate this return value out to add_note(), and return it
    from there to enable the caller to handle errors appropriately.
    
    Existing add_note() callers are updated to die() upon failure, thus
    preserving the current behaviour. The only exceptions are copy_note()
    and notes_cache_put() where we are able to propagate the add_note()
    return value instead.
    
    This patch has been improved by the following contributions:
    - Jonathan Nieder: Future-proof by always checking add_note() return value
    - Jonathan Nieder: Improve clarity of final if-condition in note_tree_insert()
    
    Thanks-to: Jonathan Nieder <jrnieder@gmail.com>
    Signed-off-by: Johan Herland <johan@herland.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    jherland authored gitster committed

Apr 02, 2010

  1. Jeff King

    introduce notes-cache interface

    Notes provide a fast lookup mechanism for data keyed by
    sha1. This is ideal for caching certain operations, like
    textconv filters.
    
    This patch builds some infrastructure to make it simpler to
    use notes trees as caches. In particular, caches:
    
      1. don't have arbitrary commit messages. They store a
         cache validity string in the commit, and clear the tree
         when the cache validity string changes.
    
      2. don't keep any commit history. The accumulated history
         of a a cache is just useless cruft.
    
      3. use a looser form of locking for ref updates. If two
         processes try to write to the cache simultaneously, it
         is OK if one overwrites the other, losing some changes.
         It's just a cache, so we will just end up with an extra
         miss.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    peff authored gitster committed
Something went wrong with that request. Please try again.