From: "Bruce E. Robertson" <bruce.e.robertson@xxxxxxxxx>
Patches are silently ignored when applied with neither --include nor
--exclude options when the current working dir is not on patch's
path. This contravenes the principle of least surprise.
"make test" results for this change:
fixed 0
success 8032
failed 0
broken 58
total 8126
Signed-off-by: Bruce E. Robertson <bruce.e.robertson@xxxxxxxxx>
---
builtin/apply.c | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/builtin/apply.c b/builtin/apply.c
index 84a8a0b..162e2aa 100644
--- a/builtin/apply.c
+++ b/builtin/apply.c
@@ -3619,6 +3619,7 @@ static struct lock_file lock_file;
static struct string_list limit_by_name;
static int has_include;
+static int has_exclude;
static void add_name_limit(const char *name, int exclude)
{
struct string_list_item *it;
@@ -3717,9 +3718,13 @@ static int apply_patch(int fd, const char *filename, int options)
listp = &patch->next;
}
else {
- /* perhaps free it a bit better? */
- free(patch);
- skipped_patch++;
+ if ( !has_exclude && !has_include ) {
+ patch->rejected = 1;
+ } else {
+ /* perhaps free it a bit better? */
+ free(patch);
+ skipped_patch++;
+ }
}
offset += nr;
}
@@ -3773,6 +3778,7 @@ static int option_parse_exclude(const struct option *opt,
const char *arg, int unset)
{
add_name_limit(arg, 1);
+ has_exclude = 1;
return 0;
}
--
1.7.7.1.432.gca458.dirty
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html