aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-02-20 10:38:42 -0800
committerJunio C Hamano <gitster@pobox.com>2010-02-20 10:38:42 -0800
commit1958e5be90be7bba3037b8a7853f0fb64f24fc09 (patch)
treef75e5739c7e43bb1f3b790afdb3dc425f28f268b
parent50c19c777d7b219914b4149e9a465542e3cb5700 (diff)
parentb39c3612eb443e77bd04d645578e1155988c6dde (diff)
downloadgit-1958e5be90be7bba3037b8a7853f0fb64f24fc09.tar.gz
git-1958e5be90be7bba3037b8a7853f0fb64f24fc09.tar.xz
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)
-rw-r--r--Documentation/git-commit.txt6
-rwxr-xr-xcontrib/fast-import/git-p45
-rwxr-xr-xt/t1450-fsck.sh16
3 files changed, 13 insertions, 14 deletions
diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt
index e99bb1475..64fb458b4 100644
--- a/Documentation/git-commit.txt
+++ b/Documentation/git-commit.txt
@@ -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
diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
index e7c48144e..cd96c6f81 100755
--- a/contrib/fast-import/git-p4
+++ b/contrib/fast-import/git-p4
@@ -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 = []
diff --git a/t/t1450-fsck.sh b/t/t1450-fsck.sh
index a22632f48..49cae3ed5 100755
--- a/t/t1450-fsck.sh
+++ b/t/t1450-fsck.sh
@@ -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
'