diff options
author | Junio C Hamano <junkio@cox.net> | 2006-11-03 05:41:47 (GMT) |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2006-11-03 05:41:47 (GMT) |
commit | aac91b7eeae4e8cf6521a5370caf03eb432ce492 (patch) | |
tree | 7542e33984d341d8dbbffb3827c37dfaea4e87cc /t/t6021-merge-criss-cross.sh | |
parent | 4508dde16951df00529207f179fee405e8646a64 (diff) | |
parent | 861ed12106d7f8e65b90c8a5ed4a026cd71a044d (diff) | |
download | git-aac91b7eeae4e8cf6521a5370caf03eb432ce492.zip git-aac91b7eeae4e8cf6521a5370caf03eb432ce492.tar.gz git-aac91b7eeae4e8cf6521a5370caf03eb432ce492.tar.bz2 |
Merge branch 'sp/keep-pack' into np/index-pack
* sp/keep-pack: (29 commits)
Remove unused variable in receive-pack.
Teach git-index-pack how to keep a pack file.
Only repack active packs by skipping over kept packs.
Allow short pack names to git-pack-objects --unpacked=.
git-send-email: Read the default SMTP server from the GIT config file
git-send-email: Document support for local sendmail instead of SMTP server
Swap the porcelain and plumbing commands in the git man page
Mention that pull can work locally in the synopsis
gitweb: Add "next" link to commitdiff view
gitweb: Move git_get_last_activity subroutine earlier
Documentation: fix git-format-patch mark-up and link it from git.txt
Documentation: Update information about <format> in git-for-each-ref
Bash completion support for aliases
gitweb: Fix up bogus $stylesheet declarations
tests: merge-recursive is usable without Python
gitweb: Check git base URLs before generating URL from it
Documentation: add git in /etc/services.
Documentation: add upload-archive service to git-daemon.
git-cherry: document limit and add diagram
diff-format.txt: Correct information about pathnames quoting in patch format
...
Diffstat (limited to 't/t6021-merge-criss-cross.sh')
-rwxr-xr-x | t/t6021-merge-criss-cross.sh | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/t/t6021-merge-criss-cross.sh b/t/t6021-merge-criss-cross.sh index 8f7366d..499cafb 100755 --- a/t/t6021-merge-criss-cross.sh +++ b/t/t6021-merge-criss-cross.sh @@ -10,12 +10,6 @@ test_description='Test criss-cross merge' . ./test-lib.sh -if test "$no_python"; then - echo "Skipping: no python => no recursive merge" - test_done - exit 0 -fi - test_expect_success 'prepare repository' \ 'echo "1 2 |