Skip to content

Commit

Permalink
Remove support for the name 'vpatch'
Browse files Browse the repository at this point in the history
Apparently it is otherwise used:
   http://www.tibed.net/index.php?page=vpatch

Signed-off-by: Neil Brown <[email protected]>
  • Loading branch information
neilbrown committed May 25, 2006
1 parent 693fe6a commit 3e4ebd5
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
3 changes: 1 addition & 2 deletions ReadMe.c
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ char Help[] = "\n"
" --extract -x : select 'extract' function.\n"
" --diff -d : select 'diff' function.\n"
" --merge -m : select 'merge' function (default).\n"
" --browse -B : select 'browse' function - default if program is 'vpatch'.\n"
" --browse -B : select 'browse' function.\n"
"\n"
" --words -w : word-wise diff and merge.\n"
" --lines -l : line-wise diff and merge.\n"
Expand Down Expand Up @@ -152,7 +152,6 @@ char HelpMerge[] = "\n"

char HelpBrowse[] = "\n"
"wiggle --browse [-R] [--strip=n] multi-file-patch\n"
"vpatch [-R] [--strip=n] multi-file-patch\n"
"\n"
"The 'browse' function provides an interactive mode for browsing a\n"
"set of patches. It allows the application of a patch to each file \n"
Expand Down
4 changes: 3 additions & 1 deletion wiggle.c
Original file line number Diff line number Diff line change
Expand Up @@ -167,11 +167,13 @@ int main(int argc, char *argv[])

base0 = strrchr(argv[0], '/');
if (base0) base0++; else base0=argv[0];
#if 0
/* The name 'vpatch' seems to be used elsewhere */
if (strcmp(base0, "vpatch")==0) {
Cmd = base0;
mode = 'B';
}

#endif
while ((opt = getopt_long(argc, argv,
short_options(mode), long_options,
&option_index)) != -1)
Expand Down

0 comments on commit 3e4ebd5

Please sign in to comment.