undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-apply: remove unused --show-files flag.

Browse Source 
Linus says he does not use it (and the thinking behind its initial
introduction), and neither Cogito nor StGIT uses it.

Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano 2005-10-16 22:06:16 -07:00
parent 973d6a2015
commit 58452f9442
2 changed files with 2 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Documentation/git-apply.txt
View File

@ -8,7 +8,7 @@ git-apply - Apply patch on a git index file and a work tree
SYNOPSIS SYNOPSIS
-------- --------
'git-apply' [--stat] [--summary] [--check] [--index] [--apply] [--show-files] [--index-info] [-z] [<patch>...] 'git-apply' [--stat] [--summary] [--check] [--index] [--apply] [--index-info] [-z] [<patch>...]
DESCRIPTION DESCRIPTION
----------- -----------
@ -45,9 +45,6 @@ OPTIONS
up-to-date, it is flagged as an error. This flag also up-to-date, it is flagged as an error. This flag also
causes the index file to be updated. causes the index file to be updated.
--show-files::
Show summary of files that are affected by the patch.
--index-info:: --index-info::
Newer git-diff output has embedded 'index information' Newer git-diff output has embedded 'index information'
for each blob to help identify the original version that for each blob to help identify the original version that

40
apply.c
View File

@ -13,7 +13,6 @@
// --check turns on checking that the working tree matches the // --check turns on checking that the working tree matches the
// files that are being modified, but doesn't apply the patch // files that are being modified, but doesn't apply the patch
// --stat does just a diffstat, and doesn't actually apply // --stat does just a diffstat, and doesn't actually apply
// --show-files shows the directory changes
// --index-info shows the old and new index info for paths if available. // --index-info shows the old and new index info for paths if available.
// //
static int check_index = 0; static int check_index = 0;
@ -22,11 +21,10 @@ static int diffstat = 0;
static int summary = 0; static int summary = 0;
static int check = 0; static int check = 0;
static int apply = 1; static int apply = 1;
static int show_files = 0;
static int show_index_info = 0; static int show_index_info = 0;
static int line_termination = '\n'; static int line_termination = '\n';
static const char apply_usage[] = static const char apply_usage[] =
"git-apply [--stat] [--summary] [--check] [--index] [--apply] [--show-files] [--index-info] [-z] <patch>..."; "git-apply [--stat] [--summary] [--check] [--index] [--apply] [--index-info] [-z] <patch>...";
/* /*
* For "diff-stat" like behaviour, we keep track of the biggest change * For "diff-stat" like behaviour, we keep track of the biggest change
@ -1270,35 +1268,6 @@ static int check_patch_list(struct patch *patch)
return error; return error;
} }
static void show_file(int c, unsigned int mode, const char *name)
{
printf("%c %o %s\n", c, mode, name);
}
static void show_file_list(struct patch *patch)
{
for (;patch ; patch = patch->next) {
if (patch->is_rename) {
show_file('-', patch->old_mode, patch->old_name);
show_file('+', patch->new_mode, patch->new_name);
continue;
}
if (patch->is_copy || patch->is_new) {
show_file('+', patch->new_mode, patch->new_name);
continue;
}
if (patch->is_delete) {
show_file('-', patch->old_mode, patch->old_name);
continue;
}
if (patch->old_mode && patch->new_mode && patch->old_mode != patch->new_mode) {
printf("M %o:%o %s\n", patch->old_mode, patch->new_mode, patch->old_name);
continue;
}
printf("M %o %s\n", patch->old_mode, patch->old_name);
}
}
static inline int is_null_sha1(const unsigned char *sha1) static inline int is_null_sha1(const unsigned char *sha1)
{ {
return !memcmp(sha1, null_sha1, 20); return !memcmp(sha1, null_sha1, 20);
@ -1675,9 +1644,6 @@ static int apply_patch(int fd)
die("Unable to write new cachefile"); die("Unable to write new cachefile");
} }
if (show_files)
show_file_list(list);
if (show_index_info) if (show_index_info)
show_index_list(list); show_index_list(list);
@ -1735,10 +1701,6 @@ int main(int argc, char **argv)
apply = 1; apply = 1;
continue; continue;
} }
if (!strcmp(arg, "--show-files")) {
show_files = 1;
continue;
}
if (!strcmp(arg, "--index-info")) { if (!strcmp(arg, "--index-info")) {
apply = 0; apply = 0;
show_index_info = 1; show_index_info = 1;