Skip to main content

Browse the archive

Revision 3c83b080e4dce42d0f48d28b03691ae1ac0dcde3 authored by Junio C Hamano on 14 March 2014, 21:25:44 UTC, committed by Junio C Hamano on 14 March 2014, 21:25:44 UTC 
Merge branch 'jk/commit-dates-parsing-fix'
 
Tighten codepaths that parse timestamps in commit objects.

* jk/commit-dates-parsing-fix:
  show_ident_date: fix tz range check
  log: do not segfault on gmtime errors
  log: handle integer overflow in timestamps
  date: check date overflow against time_t
  fsck: report integer overflow in author timestamps
  t4212: test bogus timestamps with git-log
2 parent s b37f81b + 3f419d4
Raw File
merge-blobs.h 
#ifndef MERGE_BLOBS_H
#define MERGE_BLOBS_H

#include "blob.h"

extern void *merge_blobs(const char *, struct blob *, struct blob *, struct blob *, unsigned long *);

#endif /* MERGE_BLOBS_H */
back to top