dilim/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-08-04 15:11:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'jc/show-sig' into next

Browse Source 
* 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
This commit is contained in:
Junio C Hamano
2012-01-05 13:15:48 -08:00
parent 954f125dc1 d041ffa55a
commit 5da3ae2f29
6 changed files with 140 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
commit.h
View File

@@ -200,8 +200,8 @@ extern int commit_tree_extended(const struct strbuf *msg, unsigned char *tree,
const char *author, const char *sign_commit,
struct commit_extra_header *);
extern struct commit_extra_header *read_commit_extra_headers(struct commit *);
extern struct commit_extra_header *read_commit_extra_header_lines(const char *buf, size_t len);
extern struct commit_extra_header *read_commit_extra_headers(struct commit *, const char **);
extern struct commit_extra_header *read_commit_extra_header_lines(const char *buf, size_t len, const char **);
extern void free_commit_extra_headers(struct commit_extra_header *extra);