receive-pack: use in_merge_bases() for fast-forward check

Junio C Hamano committed about 14 years ago

in_merge_bases(): support only one "other" commit

Junio C Hamano committed about 14 years ago

First half of the second batch for 1.8.0

Junio C Hamano committed about 14 years ago

Merge branch 'jk/docs-docbook-monospace-display'

Junio C Hamano committed about 14 years ago

Merge branch 'da/difftool-updates'

Junio C Hamano committed about 14 years ago

Merge branch 'js/grep-patterntype-config'

Junio C Hamano committed about 14 years ago

Merge branch 'bc/receive-pack-stdout-protection'

Junio C Hamano committed about 14 years ago

Merge branch 'ab/diff-write-incomplete-line'

Junio C Hamano committed about 14 years ago

Merge branch 'jc/maint-t7406-rev-parse-max-count-huh'

Junio C Hamano committed about 14 years ago

Merge branch 'jk/maint-null-in-trees'

Junio C Hamano committed about 14 years ago

Merge branch 'mm/push-default-switch-warning'

Junio C Hamano committed about 14 years ago

branch -v: align even when branch names are in UTF-8

Nguyễn Thái Ngọc Duy committed about 14 years ago

http: prompt for credentials on failed POST

Jeff King committed about 14 years ago

http: factor out http error code handling

Jeff King committed about 14 years ago

t: test http access to "half-auth" repositories

Jeff King committed about 14 years ago

t: test basic smart-http authentication

Jeff King committed about 14 years ago

t/lib-httpd: recognize */smart/* repos as smart-http

Jeff King committed about 14 years ago

t/lib-httpd: only route auth/dumb to dumb repos

Jeff King committed about 14 years ago

t5550: factor out http auth setup

Jeff King committed about 14 years ago

t5550: put auth-required repo in auth/dumb

Jeff King committed about 14 years ago