mirror of
https://github.com/git/git
synced 2024-08-28 20:20:07 +00:00
Merge branch 'pt/pull-log-n'
"git pull --log" and "git pull --no-log" worked as expected, but "git pull --log=20" did not. * pt/pull-log-n: pull: handle --log=<n>
This commit is contained in:
commit
14230580af
|
@ -81,8 +81,8 @@ do
|
|||
diffstat=--no-stat ;;
|
||||
--stat|--summary)
|
||||
diffstat=--stat ;;
|
||||
--log|--no-log)
|
||||
log_arg=$1 ;;
|
||||
--log|--log=*|--no-log)
|
||||
log_arg="$1" ;;
|
||||
--no-c|--no-co|--no-com|--no-comm|--no-commi|--no-commit)
|
||||
no_commit=--no-commit ;;
|
||||
--c|--co|--com|--comm|--commi|--commit)
|
||||
|
|
|
@ -17,6 +17,9 @@ test_expect_success setup '
|
|||
git commit -m "add bfile"
|
||||
) &&
|
||||
test_tick && test_tick &&
|
||||
echo "second" >afile &&
|
||||
git add afile &&
|
||||
git commit -m "second commit" &&
|
||||
echo "original $dollar" >afile &&
|
||||
git add afile &&
|
||||
git commit -m "do not clobber $dollar signs"
|
||||
|
@ -32,4 +35,18 @@ test_expect_success pull '
|
|||
)
|
||||
'
|
||||
|
||||
test_expect_success '--log=1 limits shortlog length' '
|
||||
(
|
||||
cd cloned &&
|
||||
git reset --hard HEAD^ &&
|
||||
test "$(cat afile)" = original &&
|
||||
test "$(cat bfile)" = added &&
|
||||
git pull --log=1 &&
|
||||
git log -3 &&
|
||||
git cat-file commit HEAD >result &&
|
||||
grep Dollar result &&
|
||||
! grep "second commit" result
|
||||
)
|
||||
'
|
||||
|
||||
test_done
|
||||
|
|
Loading…
Reference in a new issue