Merge branch 'maint'

* maint:
  t3701: fix here document
  git-fast-import.txt: --relative-marks takes no parameter
  shell: add missing initialization of argv0_path
This commit is contained in:
Junio C Hamano 2011-05-05 14:43:45 -07:00
commit be0dca39e9
3 changed files with 6 additions and 5 deletions

View File

@ -83,7 +83,7 @@ OPTIONS
skips the file if it does not exist.
--relative-marks::
After specifying --relative-marks= the paths specified
After specifying --relative-marks the paths specified
with --import-marks= and --export-marks= are relative
to an internal directory in the current repository.
In git-fast-import this means that the paths are relative
@ -93,7 +93,7 @@ OPTIONS
--no-relative-marks::
Negates a previous --relative-marks. Allows for combining
relative and non-relative marks by interweaving
--(no-)-relative-marks= with the --(import|export)-marks=
--(no-)-relative-marks with the --(import|export)-marks=
options.
--cat-blob-fd=<fd>::

View File

@ -137,6 +137,8 @@ int main(int argc, char **argv)
int devnull_fd;
int count;
git_extract_argv0_path(argv[0]);
/*
* Always open file descriptors 0/1/2 to avoid clobbering files
* in die(). It also avoids not messing up when the pipes are

View File

@ -82,10 +82,9 @@ EOF
'
test_expect_success PERL 'setup fake editor' '
cat >fake_editor.sh <<EOF
EOF
>fake_editor.sh &&
chmod a+x fake_editor.sh &&
test_set_editor "$(pwd)/fake_editor.sh" &&
test_set_editor "$(pwd)/fake_editor.sh"
'
test_expect_success PERL 'dummy edit works' '