summaryrefslogtreecommitdiff
path: root/t/t4252-am-options.sh
AgeCommit message (Collapse)AuthorFilesLines
2009-01-23git-am: implement --reject option passed to git-applyLibravatar martin f. krafft1-1/+10
With --reject, git-am simply passes the --reject option to git-apply and thus allows people to work with reject files if they so prefer. Signed-off-by: martin f. krafft <madduck@madduck.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-01-14git-am: fix shell quotingLibravatar Junio C Hamano1-0/+8
Noticed by Stephan Beyer; the new test is mine. Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-01-12git-am: add --directory=<dir> optionLibravatar Junio C Hamano1-0/+8
Thanks to a200337 (git-am: propagate -C<n>, -p<n> options as well, 2008-12-04) and commits around it, "git am" is equipped to correctly propagate the command line flags such as -C/-p/-whitespace across a patch failure and restart. It is trivial to support --directory option now, resurrecting previous attempts by Kevin and Simon. Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-12-05git-am: rename apply_opt_extra file to apply-optLibravatar Junio C Hamano1-1/+0
All other state files use dash in their names, not underscores. Also, there is no reason to call this "extra". Drop it. Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-12-04Test that git-am does not lose -C/-p/--whitespace optionsLibravatar Junio C Hamano1-0/+54
These tests make sure that "git am" does not lose command line options specified when it was started, after it is interrupted by a patch that does not apply earlier in the series. Signed-off-by: Junio C Hamano <gitster@pobox.com>