git/t/t9100-git-svn-basic.sh, branch v2.4.2

git-svn: Simplify calculation of GIT_DIR

2013-01-24T10:21:23Z

Since git-rev-parse already checks for the $GIT_DIR environment variable and that it returns an actual git repository, there is no need to repeat the checks again here. This also fixes a problem where git-svn did not work in cases where .git was a file with a gitdir: link. [ew: squashed test case, delay setting GIT_DIR until after `git rev-parse --cdup` to fix t9101, (thanks to Junio)] Signed-off-by: Barry Wardell Signed-off-by: Eric Wong

t9100: remove bogus " || test" after each test scriptlet

2012-02-22T05:10:33Z

Signed-off-by: Junio C Hamano

git-svn.perl: fix a false-positive in the "already exists" test

2012-02-21T21:37:31Z

open_or_add_dir checks to see if the directory already exists or not. If it already exists and is not a directory, then we fail. However, open_or_add_dir did not previously account for the possibility that the path did exist as a file, but is deleted in the current commit. In order to prevent this legitimate case from failing, open_or_add_dir needs to know what files are deleted in the current commit. Unfortunately that information has to be plumbed through a couple of layers. Signed-off-by: Steven Walter Acked-by: Eric Wong

prefer test -h over test -L in shell scripts

2010-09-27T17:48:23Z

Even though "-L" is POSIX, the former is more portable, and we tend to prefer it already. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

tests: subshell indentation stylefix

2010-09-09T22:56:20Z

Format the subshells introduced by the previous patch (Several tests: cd inside subshell instead of around, 2010-09-06) like so: ( cd subdir && ... ) && This is generally easier to read and has the nice side-effect that this patch will show what commands are used in the subshell, making it easier to check for lost environment variables and similar behavior changes. Cc: Jens Lehmann Signed-off-by: Jonathan Nieder Signed-off-by: Junio C Hamano

Merge branch 'jl/maint-fix-test'

2010-09-06T23:46:36Z

* jl/maint-fix-test: Several tests: cd inside subshell instead of around Conflicts: t/t9600-cvsimport.sh

Several tests: cd inside subshell instead of around

2010-09-06T21:30:53Z

Fixed all places where it was a straightforward change from cd'ing into a directory and back via "cd .." to a cd inside a subshell. Found these places with "git grep -w "cd \.\.". Signed-off-by: Jens Lehmann Signed-off-by: Junio C Hamano

git svn: fix dcommit to work with touched files

2010-08-02T21:21:56Z

The dcommit command fails if an otherwise unmodified file has been touched in the working directory: Cannot dcommit with a dirty index. Commit your changes first, or stash them with `git stash'. This happens because "git diff-index" reports a difference between the index and the filesystem: :100644 100644 d00491...... 000000...... M file The fix is to run "git update-index --refresh" before "git diff-index" as is done in git-rebase and git-rebase--interactive before "git diff-files". This changes dcommit to display a list of modified files before exiting. Also add a similar test case for "git svn rebase". [ew: rearranged commit message subject] Signed-off-by: David D. Kilzer Acked-by: Eric Wong

tests: Skip tests in a way that makes sense under TAP

2010-06-25T17:08:20Z

SKIP messages are now part of the TAP plan. A TAP harness now knows why a particular test was skipped and can report that information. The non-TAP harness built into Git's test-lib did nothing special with these messages, and is unaffected by these changes. Signed-off-by: Ævar Arnfjörð Bjarmason Signed-off-by: Junio C Hamano

git-svn: let 'dcommit $rev' work on $rev instead of HEAD

2009-06-25T07:38:16Z

'git svn dcommit' takes an optional revision argument, but the meaning of it was rather scary. It completely ignored the current state of the HEAD, only looking at the revisions between SVN and $rev. If HEAD was attached to $branch, the branch lost all commits $rev..$branch in the process. Considering that 'git svn dcommit HEAD^' has the intuitive meaning "dcommit all changes on my branch except the last one", we change the meaning of the revision argument. git-svn temporarily checks out $rev for its work, meaning that * if a branch is specified, that branch (_not_ the HEAD) is rebased as part of the dcommit, * if some other revision is specified, as in the example, all work happens on a detached HEAD and no branch is affected. Signed-off-by: Thomas Rast Acked-by: Eric Wong