diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-06-02 18:47:03 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-06-02 18:47:03 +0400 |
| commit | b91ffd37d5c18046f7b0bf47e939273bead9e52e (patch) | |
| tree | 6b912973a29e5fa81340388f978904764f5a0f37 /builtin-apply.c | |
| parent | f2823263bd53b62831450277c746c6cbfcb95a15 (diff) | |
| parent | 4c8d4c14c6de59bc14d6118724ffee949e8654a7 (diff) | |
Merge branch 'sb/maint-1.6.2-opt-filename-fix' into maint
* 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 8a3771e87e..a40b982242 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)) |