David Turner 2270ca9f8f rebase: ignore untracked files in submodules ...

An untracked file in a submodule should not prevent a rebase from
starting.  Even if the submodule's SHA is changed, and that file would
conflict with a new tracked file, it's still OK to start the rebase
and discover the conflict later.

Signed-off-by: David Turner <dturner@twosigma.com>

2017-03-03 15:07:54 -05:00

..

attr

Rename tests-clar to tests

2013-11-14 14:05:52 -08:00

attr_index

Rename tests-clar to tests

2013-11-14 14:05:52 -08:00

bad_tag.git

Rename tests-clar to tests

2013-11-14 14:05:52 -08:00

binaryunicode

Rename tests-clar to tests

2013-11-14 14:05:52 -08:00

blametest.git

blame: use size_t for line counts in git_blame_hunk

2015-12-01 09:02:47 +01:00

cherrypick

Added cherry pick tests

2014-04-14 16:16:22 +02:00

config

config: Add test cases that have trailing spaces before comment chars

2014-10-04 23:28:40 +08:00

crlf/.gitted

crlf: include utf8 resources in master branch

2015-06-22 11:59:54 -04:00

crlf_data

crlf tests: posix known-good data

2015-06-22 12:00:11 -04:00

deprecated-mode.git

Rename tests-clar to tests

2013-11-14 14:05:52 -08:00

describe

tests: Add "describe" test repository

2014-04-30 09:31:58 +02:00

diff

Rename tests-clar to tests

2013-11-14 14:05:52 -08:00

diff_format_email

make git_diff_stats_to_buf not show 0 insertions or 0 deletions

2016-10-09 16:03:00 +01:00

duplicate.git

Add failing test for git_object_short_id

2014-03-10 11:35:14 -07:00

empty_bare.git

Rename tests-clar to tests

2013-11-14 14:05:52 -08:00

empty_standard_repo/.gitted

Rename tests-clar to tests

2013-11-14 14:05:52 -08:00

filemodes

Rename tests-clar to tests

2013-11-14 14:05:52 -08:00

icase

Rename tests-clar to tests

2013-11-14 14:05:52 -08:00

issue_592

Rename tests-clar to tests

2013-11-14 14:05:52 -08:00

issue_592b

Rename tests-clar to tests

2013-11-14 14:05:52 -08:00

issue_1397

Rename tests-clar to tests

2013-11-14 14:05:52 -08:00

merge-recursive

merge: handle conflicts in recursive base building

2015-11-25 15:38:39 -05:00

merge-resolve

merge_trees: introduce test for submodule renames

2017-02-09 18:13:06 +00:00

merge-whitespace

Added tests to merge files and branches with whitespace problems and fixes

2015-03-16 09:53:27 +02:00

mergedrepo

Rename tests-clar to tests

2013-11-14 14:05:52 -08:00

nasty/.gitted

checkout tests: nasty symlinks

2015-01-20 17:13:09 -06:00

nsecs

index: test that we round-trip nsecs

2015-10-22 09:29:40 -04:00

partial-testrepo/.gitted

Rename tests-clar to tests

2013-11-14 14:05:52 -08:00

peeled.git

Rename tests-clar to tests

2013-11-14 14:05:52 -08:00

push_src

Rename tests-clar to tests

2013-11-14 14:05:52 -08:00

rebase

rebase: test rebasing a new commit with subfolder

2016-06-02 02:38:18 -05:00

rebase-submodule

rebase: ignore untracked files in submodules

2017-03-03 15:07:54 -05:00

redundant.git

Add test case

2015-11-02 13:47:04 +01:00

renames

Rename tests-clar to tests

2013-11-14 14:05:52 -08:00

revert

revert tests: always use core.autocrlf=false in tests

2014-10-27 17:27:25 -04:00

sha1

hash: test for sha1 collision attack detection

2017-03-03 10:50:28 +00:00

shallow.git

Rename tests-clar to tests

2013-11-14 14:05:52 -08:00

short_tag.git

Rename tests-clar to tests

2013-11-14 14:05:52 -08:00

status

tests: use legitimate object ids

2016-02-28 18:54:56 -05:00

sub.git

repo::reservedname: test a submodule update

2015-09-18 12:17:49 -04:00

submod2

Rename tests-clar to tests

2013-11-14 14:05:52 -08:00

submod2_target

Rename tests-clar to tests

2013-11-14 14:05:52 -08:00

submod3

status: test submodules with mixed case

2016-03-31 17:58:43 -04:00

submodule_simple

submodule init should resolve relative url paths

2014-12-22 16:35:45 -05:00

submodule_with_path

submodule: test updating a submodule w/ a path

2015-11-04 16:53:41 -05:00

submodules

tests: add submodule worktree test data

2017-02-13 10:13:02 +01:00

submodules-worktree-child

tests: add submodule worktree test data

2017-02-13 10:13:02 +01:00

submodules-worktree-parent

tests: add submodule worktree test data

2017-02-13 10:13:02 +01:00

super

repo::reservedname: test a submodule update

2015-09-18 12:17:49 -04:00

template

repo::init test: create hook symlink

2015-01-08 19:23:37 +00:00

testrepo/.gitted

tests: add merge-conflict branch for testrepo

2017-02-13 10:13:02 +01:00

testrepo2

remote: apply insteadOf configuration.

2015-05-31 13:21:53 +02:00

testrepo-worktree

tests: add worktree test data

2017-02-13 10:13:02 +01:00

testrepo.git

tests: fix permissions on testrepo.git index file

2017-02-13 10:34:08 +01:00

twowaymerge.git

Rename tests-clar to tests

2013-11-14 14:05:52 -08:00

typechanges

Rename tests-clar to tests

2013-11-14 14:05:52 -08:00

unsymlinked.git

Rename tests-clar to tests

2013-11-14 14:05:52 -08:00

userdiff

Update the javascript diff driver's function pattern.

2014-10-09 22:21:34 +02:00

win32-forbidden/.gitted

win32: tests around handling forbidden paths

2016-02-17 13:10:33 +00:00

.gitattributes

Rename tests-clar to tests

2013-11-14 14:05:52 -08:00

.gitignore

Rename tests-clar to tests

2013-11-14 14:05:52 -08:00

bad.index

tree-cache: Don't segfault upon corruption

2013-11-19 13:25:37 +01:00

big.index

Rename tests-clar to tests

2013-11-14 14:05:52 -08:00

gitgit.index

Rename tests-clar to tests

2013-11-14 14:05:52 -08:00

push.sh

Rename tests-clar to tests

2013-11-14 14:05:52 -08:00