Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
cleanups: ensure that git-compat-util.h is included first
CodingGuidelines states that the first #include in C files should be
git-compat-util.h or another header file that includes it, such as
cache.h or builtin.h.

Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
David Aguilar authored and Junio C Hamano committed Sep 15, 2014
1 parent 96db324 commit 1c4b660
Show file tree
Hide file tree
Showing 9 changed files with 7 additions and 8 deletions.
1 change: 1 addition & 0 deletions bulk-checkin.c
@@ -1,6 +1,7 @@
/*
* Copyright (c) 2011, Google Inc.
*/
#include "cache.h"
#include "bulk-checkin.h"
#include "csum-file.h"
#include "pack.h"
Expand Down
2 changes: 0 additions & 2 deletions bulk-checkin.h
Expand Up @@ -4,8 +4,6 @@
#ifndef BULK_CHECKIN_H
#define BULK_CHECKIN_H

#include "cache.h"

extern int index_bulk_checkin(unsigned char sha1[],
int fd, size_t size, enum object_type type,
const char *path, unsigned flags);
Expand Down
1 change: 1 addition & 0 deletions http.c
@@ -1,3 +1,4 @@
#include "git-compat-util.h"
#include "http.h"
#include "pack.h"
#include "sideband.h"
Expand Down
2 changes: 1 addition & 1 deletion merge-recursive.c
Expand Up @@ -3,8 +3,8 @@
* Fredrik Kuivinen.
* The thieves were Alex Riesen and Johannes Schindelin, in June/July 2006
*/
#include "advice.h"
#include "cache.h"
#include "advice.h"
#include "cache-tree.h"
#include "commit.h"
#include "blob.h"
Expand Down
2 changes: 1 addition & 1 deletion sigchain.c
@@ -1,5 +1,5 @@
#include "sigchain.h"
#include "cache.h"
#include "sigchain.h"

#define SIGCHAIN_MAX_SIGNALS 32

Expand Down
2 changes: 1 addition & 1 deletion test-regex.c
@@ -1,4 +1,4 @@
#include <git-compat-util.h>
#include "git-compat-util.h"

int main(int argc, char **argv)
{
Expand Down
2 changes: 1 addition & 1 deletion test-sigchain.c
@@ -1,5 +1,5 @@
#include "sigchain.h"
#include "cache.h"
#include "sigchain.h"

#define X(f) \
static void f(int sig) { \
Expand Down
1 change: 1 addition & 0 deletions varint.c
@@ -1,3 +1,4 @@
#include "git-compat-util.h"
#include "varint.h"

uintmax_t decode_varint(const unsigned char **bufp)
Expand Down
2 changes: 0 additions & 2 deletions varint.h
@@ -1,8 +1,6 @@
#ifndef VARINT_H
#define VARINT_H

#include "git-compat-util.h"

extern int encode_varint(uintmax_t, unsigned char *);
extern uintmax_t decode_varint(const unsigned char **);

Expand Down

0 comments on commit 1c4b660

Please sign in to comment.