![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Stephen Boyd <bebarino@gmail.com> | |
| Sat, 23 May 2009 18:53:11 +0000 (11:53 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sat, 23 May 2009 22:45:52 +0000 (15:45 -0700) | ||
| commit | 4c8d4c14c6de59bc14d6118724ffee949e8654a7 | |
| tree | 6c7992062186e2f0a8b7b0b1314e3bd54d6bb4aa | tree | snapshot |
| parent | aae94ffbc138181777a942ef18daf52606df833d | commit | diff |
apply, fmt-merge-msg: use relative filenames
Commit dbd0f5c7 (Files given on the command line are relative to $cwd,
2008-08-06) only fixed git-commit and git-tag. But, git-apply and
git-fmt-merge-msg didn't get the update and exhibit the same behavior.
Fix them and add tests for "apply --build-fake-ancestor" and
"fmt-merge-msg -F".
Signed-off-by: Stephen Boyd <bebarino@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commit dbd0f5c7 (Files given on the command line are relative to $cwd,
2008-08-06) only fixed git-commit and git-tag. But, git-apply and
git-fmt-merge-msg didn't get the update and exhibit the same behavior.
Fix them and add tests for "apply --build-fake-ancestor" and
"fmt-merge-msg -F".
Signed-off-by: Stephen Boyd <bebarino@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| builtin-apply.c | diff | blob | history | |
| builtin-fmt-merge-msg.c | diff | blob | history | |
| t/t4131-apply-fake-ancestor.sh | [new file with mode: 0755] | blob |
| t/t6200-fmt-merge-msg.sh | diff | blob | history |