diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-08-20 19:53:08 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-08-20 19:53:08 (GMT) |
| commit | 09c6a8e66cfe51400e6e7d5086266195c7ef62bf (patch) | |
| tree | ccef1948bd362902e625d5070384bfcb57ef2548 /builtin | |
| parent | 1e627881465dbb47eeea85aa729dd4261216ff1b (diff) | |
| parent | 840b3ca758a42cb1481259521126ba2b02a5447a (diff) | |
| download | git-09c6a8e66cfe51400e6e7d5086266195c7ef62bf.zip git-09c6a8e66cfe51400e6e7d5086266195c7ef62bf.tar.gz git-09c6a8e66cfe51400e6e7d5086266195c7ef62bf.tar.bz2 | |
Merge branch 'jn/rebase-rename-am' into maint
* jn/rebase-rename-am:
rebase: protect against diff.renames configuration
t3400 (rebase): whitespace cleanup
Teach "apply --index-info" to handle rename patches
t4150 (am): futureproof against failing tests
t4150 (am): style fix
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/apply.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/builtin/apply.c b/builtin/apply.c index 12ef9ea..f38c1f7 100644 --- a/builtin/apply.c +++ b/builtin/apply.c @@ -2979,8 +2979,7 @@ static void build_fake_ancestor(struct patch *list, const char *filename) else if (get_sha1(patch->old_sha1_prefix, sha1)) /* git diff has no index line for mode/type changes */ if (!patch->lines_added && !patch->lines_deleted) { - if (get_current_sha1(patch->new_name, sha1) || - get_current_sha1(patch->old_name, sha1)) + if (get_current_sha1(patch->old_name, sha1)) die("mode change for %s, which is not " "in current HEAD", name); sha1_ptr = sha1; |