Skip to main content

Browse the archive

Revision b4eafbcdb84fc406bff37f06fdf6310aca7d0249 authored by Junio C Hamano on 21 November 2018, 13:57:44 UTC, committed by Junio C Hamano on 21 November 2018, 13:57:44 UTC 
Merge branch 'en/rerere-multi-stage-1-fix' into maint
 
A corner case bugfix in "git rerere" code.

* en/rerere-multi-stage-1-fix:
  rerere: avoid buffer overrun
  t4200: demonstrate rerere segfault on specially crafted merge
2 parent s e1372c3 + ad2bf0d
Raw File
bulk-checkin.h 
/*
 * Copyright (c) 2011, Google Inc.
 */
#ifndef BULK_CHECKIN_H
#define BULK_CHECKIN_H

#include "cache.h"

extern int index_bulk_checkin(struct object_id *oid,
			      int fd, size_t size, enum object_type type,
			      const char *path, unsigned flags);

extern void plug_bulk_checkin(void);
extern void unplug_bulk_checkin(void);

#endif
back to top