tgif.git - Terin's Improved Git Fork

Age	Commit message (Collapse)	Author	Files	Lines
2011-12-11	t3401: use test_commit in setup	Martin von Zweigbergk	1	-25/+10
	Simplify t3401 by using test_commit in the setup. This lets us refer to commits using their tags and there is no longer a need to create the branch my-topic-branch-merge. Also, the branch master-merge points to the same commit as master (even before this change), so that branch does not need to be created either. While at it, replace "test ! -d" by "test_path_is_missing". Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-12-11	t3401: modernize style	Martin von Zweigbergk	1	-34/+33
	Put the opening quote starting each test on the same line as the test_expect_* invocation. Also make sure to use tabs for indentation. Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-09-03	tests: use "git xyzzy" form (t0000 - t3599)	Nanako Shiraishi	1	-11/+11
	Converts tests between t0050-t3903. Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-07-21	Rename .git/rebase to .git/rebase-apply	Johannes Schindelin	1	-1/+1
	With git-am, it sounds awkward to have the patches in ".git/rebase/", but for technical reasons, we have to keep the same directory name for git-am and git-rebase. ".git/rebase-apply" seems to be a good compromise. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-07-15	Rename ".dotest/" to ".git/rebase" and ".dotest-merge" to "rebase-merge"	Johannes Schindelin	1	-2/+2
	Since the files generated and used during a rebase are never to be tracked, they should live in $GIT_DIR. While at it, avoid the rather meaningless term "dotest" to "rebase", and unhide ".dotest-merge". This was wished for on the mailing list, but so far unimplemented. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2007-07-02	Rewrite "git-frotz" to "git frotz"	Junio C Hamano	1	-9/+9
	This uses the remove-dashes target to replace "git-frotz" to "git frotz". Signed-off-by: Junio C Hamano <gitster@pobox.com>
2006-10-27	tests: merge-recursive is usable without Python	Junio C Hamano	1	-4/+1
	Many tests still protected themselves with $no_python; there is no need to do so anymore. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-25	rebase: allow --merge option to handle patches merged upstream	Eric Wong	1	-1/+12
	Enhance t3401-rebase-partial to test with --merge as well as the standard am -3 strategy. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-01-08	Add a test for rebase when a change was picked upstream	Yann Dirson	1	-0/+53
	This test exercises the standard feature that makes rebase useful. Signed-off-by: Yann Dirson <ydirson@altern.org> Signed-off-by: Junio C Hamano <junkio@cox.net>