diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-05-29 15:01:16 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-05-29 15:01:16 -0700 |
| commit | 9affecbc89538b6fd63f772b6f14047bced9345e (patch) | |
| tree | b4047fd9dec7f6dde2c1d41eae23d8ce74375dc4 /builtin-apply.c | |
| parent | 659f09689614d3d745b9aea746672bf43216d294 (diff) | |
| parent | 4c8d4c14c6de59bc14d6118724ffee949e8654a7 (diff) | |
| download | git-9affecbc89538b6fd63f772b6f14047bced9345e.tar.gz git-9affecbc89538b6fd63f772b6f14047bced9345e.tar.xz | |
Merge branch 'sb/maint-1.6.2-opt-filename-fix'
* sb/maint-1.6.2-opt-filename-fix:
apply, fmt-merge-msg: use relative filenames
commit: -F overrides -t
Diffstat (limited to 'builtin-apply.c')
| -rw-r--r-- | builtin-apply.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/builtin-apply.c b/builtin-apply.c index 8a3771e87..a40b98224 100644 --- a/builtin-apply.c +++ b/builtin-apply.c @@ -3315,6 +3315,10 @@ int cmd_apply(int argc, const char **argv, const char *unused_prefix) argc = parse_options(argc, argv, builtin_apply_options, apply_usage, 0); + fake_ancestor = parse_options_fix_filename(prefix, fake_ancestor); + if (fake_ancestor) + fake_ancestor = xstrdup(fake_ancestor); + if (apply_with_reject) apply = apply_verbosely = 1; if (!force_apply && (diffstat || numstat || summary || check || fake_ancestor)) |