global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-01-18 22:56:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into next

Browse Source 
* master:
  update-index --refresh --porcelain: add missing const
  checkout: add missing const to describe_detached_head
This commit is contained in:
Junio C Hamano
2011-02-22 17:35:28 -08:00
parent 6f4acd852f 046613c546
commit a6e4e595bd
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/checkout.c
View File

@@ -298,7 +298,7 @@ static void show_local_changes(struct object *head, struct diff_options *opts)
run_diff_index(&rev, 0);
}
static void describe_detached_head(char *msg, struct commit *commit)
static void describe_detached_head(const char *msg, struct commit *commit)
{
struct strbuf sb = STRBUF_INIT;
struct pretty_print_context ctx = {0};

2
cache.h
View File

@@ -526,7 +526,7 @@ extern void fill_stat_cache_info(struct cache_entry *ce, struct stat *st);
#define REFRESH_IGNORE_MISSING 0x0008 /* ignore non-existent */
#define REFRESH_IGNORE_SUBMODULES 0x0010 /* ignore submodules */
#define REFRESH_IN_PORCELAIN 0x0020 /* user friendly output, not "needs update" */
extern int refresh_index(struct index_state *, unsigned int flags, const char **pathspec, char *seen, char *header_msg);
extern int refresh_index(struct index_state *, unsigned int flags, const char **pathspec, char *seen, const char *header_msg);
struct lock_file {
struct lock_file *next;

4
read-cache.c
View File

@@ -1083,7 +1083,7 @@ static struct cache_entry *refresh_cache_ent(struct index_state *istate,
}
static void show_file(const char * fmt, const char * name, int in_porcelain,
int * first, char *header_msg)
int * first, const char *header_msg)
{
if (in_porcelain && *first && header_msg) {
printf("%s\n", header_msg);
@@ -1093,7 +1093,7 @@ static void show_file(const char * fmt, const char * name, int in_porcelain,
}
int refresh_index(struct index_state *istate, unsigned int flags, const char **pathspec,
char *seen, char *header_msg)
char *seen, const char *header_msg)
{
int i;
int has_errors = 0;