mirror of
https://github.com/git/git
synced 2024-08-28 12:09:19 +00:00
Honor -p<n> when applying git diffs
If the user is trying to apply a Git generated diff file and they have specified a -p<n> option, where <n> is not 1, the user probably has a good reason for doing this. Such as they are me, trying to apply a patch generated in git.git for the git-gui subdirectory to the git-gui.git repository, where there is no git-gui subdirectory present. Users shouldn't supply -p2 unless they mean it. But if they are supplying it, they probably have thought about how to make this patch apply to their working directory, and want to risk whatever results may come from that. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
parent
766b084f59
commit
79ee194e52
|
@ -417,7 +417,7 @@ static int gitdiff_hdrend(const char *line, struct patch *patch)
|
|||
static char *gitdiff_verify_name(const char *line, int isnull, char *orig_name, const char *oldnew)
|
||||
{
|
||||
if (!orig_name && !isnull)
|
||||
return find_name(line, NULL, 1, TERM_TAB);
|
||||
return find_name(line, NULL, p_value, TERM_TAB);
|
||||
|
||||
if (orig_name) {
|
||||
int len;
|
||||
|
@ -427,7 +427,7 @@ static char *gitdiff_verify_name(const char *line, int isnull, char *orig_name,
|
|||
len = strlen(name);
|
||||
if (isnull)
|
||||
die("git-apply: bad git-diff - expected /dev/null, got %s on line %d", name, linenr);
|
||||
another = find_name(line, NULL, 1, TERM_TAB);
|
||||
another = find_name(line, NULL, p_value, TERM_TAB);
|
||||
if (!another || memcmp(another, name, len))
|
||||
die("git-apply: bad git-diff - inconsistent %s filename on line %d", oldnew, linenr);
|
||||
free(another);
|
||||
|
|
25
t/t4120-apply-popt.sh
Executable file
25
t/t4120-apply-popt.sh
Executable file
|
@ -0,0 +1,25 @@
|
|||
#!/bin/sh
|
||||
#
|
||||
# Copyright (c) 2007 Shawn O. Pearce
|
||||
#
|
||||
|
||||
test_description='git-apply -p handling.'
|
||||
|
||||
. ./test-lib.sh
|
||||
|
||||
test_expect_success setup '
|
||||
mkdir sub &&
|
||||
echo A >sub/file1 &&
|
||||
cp sub/file1 file1 &&
|
||||
git add sub/file1 &&
|
||||
echo B >sub/file1 &&
|
||||
git diff >patch.file &&
|
||||
rm sub/file1 &&
|
||||
rmdir sub
|
||||
'
|
||||
|
||||
test_expect_success 'apply git diff with -p2' '
|
||||
git apply -p2 patch.file
|
||||
'
|
||||
|
||||
test_done
|
Loading…
Reference in a new issue