Browse Source

pretty.h: move has_non_ascii() declaration from commit.h

The function is defined in pretty.c, so this moves the declaration to
a more logical place.

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
main
Elijah Newren 2 years ago committed by Junio C Hamano
parent
commit
b6c09c03eb
  1. 1
      commit.h
  2. 4
      diffcore-pickaxe.c
  3. 2
      pretty.h

1
commit.h

@ -205,7 +205,6 @@ void free_commit_list(struct commit_list *list);


struct rev_info; /* in revision.h, it circularly uses enum cmit_fmt */ struct rev_info; /* in revision.h, it circularly uses enum cmit_fmt */


int has_non_ascii(const char *text);
const char *logmsg_reencode(const struct commit *commit, const char *logmsg_reencode(const struct commit *commit,
char **commit_encoding, char **commit_encoding,
const char *output_encoding); const char *output_encoding);

4
diffcore-pickaxe.c

@ -2,12 +2,12 @@
* Copyright (C) 2005 Junio C Hamano * Copyright (C) 2005 Junio C Hamano
* Copyright (C) 2010 Google Inc. * Copyright (C) 2010 Google Inc.
*/ */
#include "cache.h" #include "git-compat-util.h"
#include "diff.h" #include "diff.h"
#include "diffcore.h" #include "diffcore.h"
#include "xdiff-interface.h" #include "xdiff-interface.h"
#include "kwset.h" #include "kwset.h"
#include "commit.h" #include "pretty.h"
#include "quote.h" #include "quote.h"


typedef int (*pickaxe_fn)(mmfile_t *one, mmfile_t *two, typedef int (*pickaxe_fn)(mmfile_t *one, mmfile_t *two,

2
pretty.h

@ -153,6 +153,8 @@ int commit_format_is_empty(enum cmit_fmt);
/* Make subject of commit message suitable for filename */ /* Make subject of commit message suitable for filename */
void format_sanitized_subject(struct strbuf *sb, const char *msg, size_t len); void format_sanitized_subject(struct strbuf *sb, const char *msg, size_t len);


int has_non_ascii(const char *text);

/* /*
* Set values of fields in "struct process_trailer_options" * Set values of fields in "struct process_trailer_options"
* according to trailers arguments. * according to trailers arguments.

Loading…
Cancel
Save