Skip to content

Commit

Permalink
Merge branch 'maint'
Browse files Browse the repository at this point in the history
* maint:
  Fix typo in pack-objects' usage
  Make sure that git_getpass() never returns NULL
  t0004 (unwritable files): simplify error handling
  rev-list-options: clarify --parents and --children
  • Loading branch information
gitster committed Sep 30, 2010
2 parents 9855b08 + 8695353 commit 1e63341
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 45 deletions.
8 changes: 4 additions & 4 deletions Documentation/rev-list-options.txt
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,13 @@ endif::git-rev-list[]

--parents::

Print the parents of the commit. Also enables parent
rewriting, see 'History Simplification' below.
Print also the parents of the commit (in the form "commit parent...").
Also enables parent rewriting, see 'History Simplification' below.

--children::

Print the children of the commit. Also enables parent
rewriting, see 'History Simplification' below.
Print also the children of the commit (in the form "commit child...").
Also enables parent rewriting, see 'History Simplification' below.

ifdef::git-rev-list[]
--timestamp::
Expand Down
2 changes: 1 addition & 1 deletion builtin/pack-objects.c
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ static const char pack_usage[] =
" [--no-reuse-delta] [--no-reuse-object] [--delta-base-offset]\n"
" [--threads=N] [--non-empty] [--revs [--unpacked | --all]*]\n"
" [--reflog] [--stdout | base-name] [--include-tag]\n"
" [--keep-unreachable | --unpack-unreachable \n"
" [--keep-unreachable | --unpack-unreachable]\n"
" [<ref-list | <object-list]";

struct object_entry {
Expand Down
8 changes: 6 additions & 2 deletions connect.c
Original file line number Diff line number Diff line change
Expand Up @@ -631,8 +631,12 @@ char *git_getpass(const char *prompt)
askpass = askpass_program;
if (!askpass)
askpass = getenv("SSH_ASKPASS");
if (!askpass || !(*askpass))
return getpass(prompt);
if (!askpass || !(*askpass)) {
char *result = getpass(prompt);
if (!result)
die_errno("Could not read password");
return result;
}

args[0] = askpass;
args[1] = prompt;
Expand Down
52 changes: 14 additions & 38 deletions t/t0004-unwritable.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,53 +16,29 @@ test_expect_success setup '
'

test_expect_success POSIXPERM,SANITY 'write-tree should notice unwritable repository' '
(
chmod a-w .git/objects .git/objects/?? &&
test_must_fail git write-tree
)
status=$?
chmod 775 .git/objects .git/objects/??
(exit $status)
test_when_finished "chmod 775 .git/objects .git/objects/??" &&
chmod a-w .git/objects .git/objects/?? &&
test_must_fail git write-tree
'

test_expect_success POSIXPERM,SANITY 'commit should notice unwritable repository' '
(
chmod a-w .git/objects .git/objects/?? &&
test_must_fail git commit -m second
)
status=$?
chmod 775 .git/objects .git/objects/??
(exit $status)
test_when_finished "chmod 775 .git/objects .git/objects/??" &&
chmod a-w .git/objects .git/objects/?? &&
test_must_fail git commit -m second
'

test_expect_success POSIXPERM,SANITY 'update-index should notice unwritable repository' '
(
echo 6O >file &&
chmod a-w .git/objects .git/objects/?? &&
test_must_fail git update-index file
)
status=$?
chmod 775 .git/objects .git/objects/??
(exit $status)
test_when_finished "chmod 775 .git/objects .git/objects/??" &&
echo 6O >file &&
chmod a-w .git/objects .git/objects/?? &&
test_must_fail git update-index file
'

test_expect_success POSIXPERM,SANITY 'add should notice unwritable repository' '
(
echo b >file &&
chmod a-w .git/objects .git/objects/?? &&
test_must_fail git add file
)
status=$?
chmod 775 .git/objects .git/objects/??
(exit $status)
test_when_finished "chmod 775 .git/objects .git/objects/??" &&
echo b >file &&
chmod a-w .git/objects .git/objects/?? &&
test_must_fail git add file
'

test_done

0 comments on commit 1e63341

Please sign in to comment.