kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Add "--unmerged" flag to "show-files", which does what the name implies. 

The flag also implies "--stage", since unmerged file information doesn't
make sense without the full output.
maint
Linus Torvalds 2005-04-16 12:43:32 -07:00
parent 2fbdd13174
commit eec8c633c1
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
show-files.c
View File

@ -15,6 +15,7 @@ static int show_cached = 0;
static int show_others = 0; static int show_others = 0;
static int show_ignored = 0; static int show_ignored = 0;
static int show_stage = 0; static int show_stage = 0;
static int show_unmerged = 0;
static int line_terminator = '\n'; static int line_terminator = '\n';


static const char **dir; static const char **dir;
@ -112,6 +113,8 @@ static void show_files(void)
if (show_cached | show_stage) { if (show_cached | show_stage) {
for (i = 0; i < active_nr; i++) { for (i = 0; i < active_nr; i++) {
struct cache_entry *ce = active_cache[i]; struct cache_entry *ce = active_cache[i];
if (show_unmerged && !ce_stage(ce))
continue;
if (!show_stage) if (!show_stage)
printf("%s%c", ce->name, line_terminator); printf("%s%c", ce->name, line_terminator);
else else
@ -170,12 +173,18 @@ int main(int argc, char **argv)
show_stage = 1; show_stage = 1;
continue; continue;
} }
if (!strcmp(arg, "--unmerged")) {
// There's no point in showing unmerged unless you also show the stage information
show_stage = 1;
show_unmerged = 1;
continue;
}


usage("show-files [-z] (--[cached|deleted|others|ignored|stage])*"); usage("show-files [-z] (--[cached|deleted|others|ignored|stage])*");
} }


/* With no flags, we default to showing the cached files */ /* With no flags, we default to showing the cached files */
if (!(show_stage | show_deleted | show_others | show_ignored)) if (!(show_stage | show_deleted | show_others | show_ignored | show_unmerged))
show_cached = 1; show_cached = 1;


read_cache(); read_cache();