Staging
v0.5.1
https://github.com/git/git
Revision b0883aa6c77111e88496bd0afe073caf68ab9f99 authored by Junio C Hamano on 30 January 2010, 20:08:26 UTC, committed by Junio C Hamano on 30 January 2010, 21:56:56 UTC
Even when the environment was given for the top-level process, checking
in the submodule work tree should use the index file associated with the
work tree of the submodule.  Do not export it to the environment.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent a9c7c43
Raw File
Tip revision: b0883aa6c77111e88496bd0afe073caf68ab9f99 authored by Junio C Hamano on 30 January 2010, 20:08:26 UTC
is_submodule_modified(): fix breakage with external GIT_INDEX_FILE
Tip revision: b0883aa
wt-status.h
#ifndef STATUS_H
#define STATUS_H

#include <stdio.h>
#include "string-list.h"
#include "color.h"

enum color_wt_status {
	WT_STATUS_HEADER = 0,
	WT_STATUS_UPDATED,
	WT_STATUS_CHANGED,
	WT_STATUS_UNTRACKED,
	WT_STATUS_NOBRANCH,
	WT_STATUS_UNMERGED,
};

enum untracked_status_type {
	SHOW_NO_UNTRACKED_FILES,
	SHOW_NORMAL_UNTRACKED_FILES,
	SHOW_ALL_UNTRACKED_FILES
};

struct wt_status_change_data {
	int worktree_status;
	int index_status;
	int stagemask;
	char *head_path;
};

struct wt_status {
	int is_initial;
	char *branch;
	const char *reference;
	const char **pathspec;
	int verbose;
	int amend;
	int in_merge;
	int nowarn;
	int use_color;
	int relative_paths;
	int submodule_summary;
	enum untracked_status_type show_untracked_files;
	char color_palette[WT_STATUS_UNMERGED+1][COLOR_MAXLEN];

	/* These are computed during processing of the individual sections */
	int commitable;
	int workdir_dirty;
	int workdir_untracked;
	const char *index_file;
	FILE *fp;
	const char *prefix;
	struct string_list change;
	struct string_list untracked;
};

void wt_status_prepare(struct wt_status *s);
void wt_status_print(struct wt_status *s);
void wt_status_collect(struct wt_status *s);

void wt_shortstatus_print(struct wt_status *s, int null_termination);
void wt_porcelain_print(struct wt_status *s, int null_termination);

#endif /* STATUS_H */
back to top