Merge branch 'maint'

* maint:
  git-p4: fix bug in symlink handling
  t1450: fix testcases that were wrongly expecting failure
  Documentation: Fix indentation problem in git-commit(1)
This commit is contained in:
Junio C Hamano 2010-02-20 10:38:42 -08:00
commit 1958e5be90
3 changed files with 13 additions and 14 deletions

View File

@ -197,13 +197,13 @@ FROM UPSTREAM REBASE" section in linkgit:git-rebase[1].)
Show untracked files (Default: 'all').
+
The mode parameter is optional, and is used to specify
the handling of untracked files. The possible options are:
the handling of untracked files.
+
The possible options are:
+
--
- 'no' - Show no untracked files
- 'normal' - Shows untracked files and directories
- 'all' - Also shows individual files in untracked directories.
--
+
See linkgit:git-config[1] for configuration variable
used to change the default for when the option is not

View File

@ -967,9 +967,8 @@ class P4Sync(Command):
elif file["type"] == "symlink":
mode = "120000"
# p4 print on a symlink contains "target\n", so strip it off
last = contents.pop()
last = last[:-1]
contents.append(last)
data = ''.join(contents)
contents = [data[:-1]]
if self.isWindows and file["type"].endswith("text"):
mangled = []

View File

@ -66,12 +66,12 @@ tagger T A Gger <tagger@example.com> 1234567890 -0000
This is an invalid tag.
EOF
test_expect_failure 'tag pointing to nonexistent' '
tag=$(git hash-object -w --stdin < invalid-tag) &&
test_expect_success 'tag pointing to nonexistent' '
tag=$(git hash-object -t tag -w --stdin < invalid-tag) &&
echo $tag > .git/refs/tags/invalid &&
git fsck --tags 2>out &&
test_must_fail git fsck --tags >out &&
cat out &&
grep "could not load tagged object" out &&
grep "broken link" out &&
rm .git/refs/tags/invalid
'
@ -84,12 +84,12 @@ tagger T A Gger <tagger@example.com> 1234567890 -0000
This is an invalid tag.
EOF
test_expect_failure 'tag pointing to something else than its type' '
tag=$(git hash-object -w --stdin < wrong-tag) &&
test_expect_success 'tag pointing to something else than its type' '
tag=$(git hash-object -t tag -w --stdin < wrong-tag) &&
echo $tag > .git/refs/tags/wrong &&
git fsck --tags 2>out &&
test_must_fail git fsck --tags 2>out &&
cat out &&
grep "some sane error message" out &&
grep "error in tag.*broken links" out &&
rm .git/refs/tags/wrong
'