development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-07-17 02:57:48 +00:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

git-apply: retire unused/unimplemented --no-merge flag.

Browse source 
The original plan was to do 3-way merge between local working tree,
index and the patch being applied, but that was never implemented.
Retire the flag to control its behaviour.

Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano 2005-10-03 22:28:45 -07:00
parent 56d33b1105
commit c2d5036de5
2 changed files with 2 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Documentation/git-apply.txt
View file

@ -9,7 +9,7 @@ git-apply - Apply patch on a GIT index file and a work tree
SYNOPSIS
--------
'git-apply' [--no-merge] [--stat] [--summary] [--check] [--index] [--show-files] [--apply] [<patch>...]
'git-apply' [--stat] [--summary] [--check] [--index] [--show-files] [--apply] [<patch>...]
DESCRIPTION
-----------
@ -22,11 +22,6 @@ OPTIONS
The files to read patch from. '-' can be used to read
from the standard input.
--no-merge::
The default mode of operation is the merge behaviour
which is not implemented yet. This flag explicitly
tells the program not to use the merge behaviour.
--stat::
Instead of applying the patch, output diffstat for the
input. Turns off "apply".

17
apply.c
View file

@ -5,26 +5,16 @@
*
* This applies patches on top of some (arbitrary) version of the SCM.
*
* NOTE! It does all its work in the index file, and only cares about
* the files in the working directory if you tell it to "merge" the
* patch apply.
*
* Even when merging it always takes the source from the index, and
* uses the working tree as a "branch" for a 3-way merge.
*/
#include <ctype.h>
#include <fnmatch.h>
#include "cache.h"
// We default to the merge behaviour, since that's what most people would
// expect.
//
// --check turns on checking that the working tree matches the
// files that are being modified, but doesn't apply the patch
// --stat does just a diffstat, and doesn't actually apply
// --show-files shows the directory changes
//
static int merge_patch = 1;
static int check_index = 0;
static int write_index = 0;
static int diffstat = 0;
@ -33,7 +23,7 @@ static int check = 0;
static int apply = 1;
static int show_files = 0;
static const char apply_usage[] =
"git-apply [--no-merge] [--stat] [--summary] [--check] [--index] [--apply] [--show-files] <patch>...";
"git-apply [--stat] [--summary] [--check] [--index] [--apply] [--show-files] <patch>...";
/*
* For "diff-stat" like behaviour, we keep track of the biggest change
@ -1517,11 +1507,6 @@ int main(int argc, char **argv)
excludes = x;
continue;
}
/* NEEDSWORK: this does not do anything at this moment. */
if (!strcmp(arg, "--no-merge")) {
merge_patch = 0;
continue;
}
if (!strcmp(arg, "--stat")) {
apply = 0;
diffstat = 1;