repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
t6036: fix broken "merge fails but has appropriate contents" tests
2018-07-03
Eric Sunsh
i
ne
t6036
:
fix
b
roken "mer
g
e fail
s
but ha
s
appropriate
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-07-03
Eric S
u
nshine
t
5505: mo
d
ern
i
ze and simplify
ha
r
d-to-dige
s
t test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-07-03
Eric Sunshi
n
e
t
5
406: use
write_script() inst
e
ad
o
f bir
t
hing shell
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-07-03
Er
i
c Sunshi
n
e
t5405
:
u
s
e test_must_fa
i
l() instead o
f
c
h
eckin
g
ex
i
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-07-03
Eric Sunshine
t
/l
i
b-submodule-update: f
i
x
"ab
s
or
b
ing" test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-07-03
Eric Sunshine
t: drop unn
e
cessar
y
term
i
n
ating semicolon in
su
b
sh
e
ll
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-07-03
Eric S
u
nshine
t
: use sane_
u
nset()
r
a
t
he
r
than
'
uns
e
t' with bro
k
e
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-07-03
E
r
ic
Sunshine
t: use test_wr
i
te_lines() instead of series
o
f
'
ec
h
o
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-07-03
Eric
Sunsh
i
ne
t: u
s
e
t
est_mig
h
t_
f
ail(
)
instead of manipulating exit
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-28
Junio
C
Hamano
Second batch
for 2
.
19 cycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-28
J
unio C Ham
a
no
M
e
r
ge branch
'sb/fi
x
-fetching-mov
e
d-submod
u
les'
commit
|
commitdiff
|
tree
2018-06-28
Junio C
H
amano
Merge branch 'tz/cred-netrc-cleanup'
commit
|
commitdiff
|
tree
2018-06-28
Junio C Hamano
Merg
e
branc
h
'
j
c
/clean-after-sanity-tests'
commit
|
commitdiff
|
tree
2018-06-28
Jun
i
o C Ha
m
ano
Merge b
r
anch
'
nd/
c
ompletion-negation'
commit
|
commitdiff
|
tree
2018-06-28
Jun
i
o C Ham
a
no
Merge bra
n
ch 'pw/add-p-reco
u
nt'
commit
|
commitdiff
|
tree
2018-06-28
Junio
C
Hama
n
o
Merge b
r
anc
h
'jk/fetch-all-peeled-fix'
commit
|
commitdiff
|
tree
2018-06-28
Jun
i
o C Hama
n
o
Merg
e
branch 'ms
/
s
e
n
d-pac
k
-
h
onor-config'
commit
|
commitdiff
|
tree
2018-06-28
Juni
o
C Hamano
Merge branch 'jh/partial-clone'
commit
|
commitdiff
|
tree
2018-06-28
Junio C Hamano
M
e
r
ge branch 'sg/gp
g
-
t
e
s
ts-fix'
commit
|
commitdiff
|
tree
2018-06-28
Junio C Hama
n
o
M
erg
e
b
ranch
'as/safecrl
f
-quiet-fi
x
'
commit
|
commitdiff
|
tree
2018-06-28
Junio C Ha
m
a
no
Mer
g
e
b
r
a
nch '
a
b/re
f
spec-init-fix'
commit
|
commitdiff
|
tree
2018-06-25
Juni
o
C
Hamano
First bat
c
h for 2
.
19 cycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-25
Junio
C Ha
m
ano
Merge branch 's
b
/plug-misc-leaks'
commit
|
commitdiff
|
tree
2018-06-25
Ju
n
io C Ha
m
ano
Merge branch 'cc
/
te
s
ts
-
w
i
t
h
out-assuming-ref-files-back
e
nd'
commit
|
commitdiff
|
tree
2018-06-25
Jun
i
o C Hama
n
o
Mer
g
e branch
'
sg/
u
pdate-
r
e
f-stdin
-
cleanup'
commit
|
commitdiff
|
tree
2018-06-25
Ju
n
io C Hamano
M
e
rge branch 'nd/reject-empty-sh
a
llow-request'
commit
|
commitdiff
|
tree
2018-06-25
Junio C H
a
mano
Merge
b
r
a
n
ch 'ls/com
p
lete
-
r
e
mo
t
e
-update-names'
commit
|
commitdiff
|
tree
2018-06-25
Ju
n
io C Hamano
Merge branch 'ag/rebase-
p
'
commit
|
commitdiff
|
tree
2018-06-25
J
u
nio C
H
a
mano
M
e
rge branch
'
nd/comp
l
e
t
e-config-vars'
commit
|
commitdiff
|
tree
2018-06-25
Junio C
H
amano
Merge branch 's
b
/objec
t
-store-alloc'
commit
|
commitdiff
|
tree
2018-06-25
Ju
n
io
C
Hamano
Merge branc
h
'jk/show-index'
commit
|
commitdiff
|
tree
2018-06-25
Junio C Hama
n
o
Merge branch 'en/merge-recursi
v
e-tests'
commit
|
commitdiff
|
tree
2018-06-25
Junio C
Hamano
Me
r
ge br
a
nch '
n
d/diff-ap
p
ly-ita'
commit
|
commitdiff
|
tree
2018-06-25
Junio C Ham
a
no
Merge branch 'ds/commit-graph-lockfile-fix'
commit
|
commitdiff
|
tree
2018-06-25
Ju
n
i
o
C Hamano
Merge branch 'nd/comm
i
t-util
-
t
o-slab'
commit
|
commitdiff
|
tree
2018-06-25
Junio C Hamano
M
e
rge branch 'pc/submodule
-
he
l
per-fore
a
ch'
commit
|
commitdiff
|
tree
2018-06-25
Ju
n
io C Hamano
P
repare to st
a
r
t 2
.
19
cycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-25
S
t
efan B
e
ller
sequencer
.
c:
plug mem leak in g
i
t_sequenc
e
r_config
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-21
Junio
C
H
a
mano
Git 2
.
18
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-19
Junio
C
H
amano
M
e
rg
e
branch
'en/ren
a
me-directory-detectio
n
-
r
eboot'
commit
|
commitdiff
|
tree
2018-06-19
Jun
i
o C Hamano
Merge tag 'l1
0
n-2
.
18
.
0-rnd3
.
1' of git://gi
t
hub
.
com
.
.
.
commit
|
commitdiff
|
tree
2018-06-19
J
unio C H
a
m
a
no
Merg
e
b
r
anch 'cf/s
u
bmodule-p
r
ogr
e
s
s
-
d
iss
o
ciate'
commit
|
commitdiff
|
tree
2018-06-19
Junio C
Hamano
Merge bra
n
ch 'js/r
e
ba
s
e-i-r
o
ot-fix'
commit
|
commitdiff
|
tree
2018-06-19
Stefan Bel
l
er
t7400: encap
s
ulate setup code in t
e
st_expec
t
_success
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-19
Todd Zullinger
t3
4
04: check root commit in 'rebase -i
--
r
o
o
t reword
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-19
K
a
rthikeyan Sing
a
rav
e
lan
do
c
:
f
ix typos i
n
d
ocumentation and rele
a
se notes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-18
Todd Zul
l
ing
e
r
gi
t
-credential-netrc: make
"all" default target o
f
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-18
Junio C Haman
o
Almost 2
.
1
8
fina
l
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-18
Juni
o
C Hamano
Merge branch 'e
s
/
m
ake-no-i
c
o
n
v
'
commit
|
commitdiff
|
tree
2018-06-18
J
u
nio
C
Hamano
M
er
g
e bran
c
h '
s
g/t
7
406-
c
hai
n
-fix'
commit
|
commitdiff
|
tree
2018-06-18
Junio C Hamano
Me
r
ge branch 'ks/
b
ranch-set-
u
pstream'
commit
|
commitdiff
|
tree
2018-06-18
Junio C Hamano
Merge branch 'js/reba
s
e-
i
-
root-fix'
commit
|
commitdiff
|
tree
2018-06-18
J
u
n
i
o
C Haman
o
Merge
bra
n
ch
'
jk/
e
wah-bounds-ch
e
c
k'
commit
|
commitdiff
|
tree
2018-06-18
Junio C Ha
m
ano
Merge tag 'l10n-2
.
18
.
0-rnd3' of git://gith
u
b
.
com/git
.
.
.
commit
|
commitdiff
|
tree
2018-06-18
Junio C Hamano
A bunc
h
of mic
r
o
-
fixes bef
o
r
e
going 2
.
18 final
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-18
Jun
i
o C
Hama
n
o
Merge branch 'sb
/
blame-color'
commit
|
commitdiff
|
tree
2018-06-18
Jun
i
o C
H
a
mano
M
e
rge branch 'mw/doc
-
m
erge-enum
f
ix'
commit
|
commitdiff
|
tree
2018-06-18
Junio C Ham
a
no
Mer
g
e branch
'
en/rename-directory-detection'
commit
|
commitdiff
|
tree
2018-06-18
Junio
C
H
amano
Merge branch 'rd/doc-rem
o
te-tra
c
king
-
with-
h
yph
e
n'
commit
|
commitdiff
|
tree
2018-06-18
Junio C H
a
mano
Mer
g
e branch '
j
l/zl
i
b-restore-nul
-
termination
'
commit
|
commitdiff
|
tree
2018-06-18
Ju
n
io
C
Hamano
Merge branc
h
'ab/cr
e
d-netrc-no-autodie'
commit
|
commitdiff
|
tree
2018-06-18
Ju
n
io
C
Hamano
Merge branch 'km/doc-work
f
lows-typofix'
commit
|
commitdiff
|
tree
2018-06-18
Junio
C
Hamano
M
e
rge branch 'ld/
g
it-
p
4-updates'
commit
|
commitdiff
|
tree
2018-06-18
Juni
o
C Ham
a
no
Merge branch
'
rd/diff-o
p
t
i
o
ns-typof
i
x'
commit
|
commitdiff
|
tree
2018-06-18
Jun
i
o
C Hamano
Merge branch 'rd/co
m
ment-ty
p
ofix
-
i
n
-
sha1-file'
commit
|
commitdiff
|
tree
2018-06-18
R
e
né Scharfe
merge
-
rec
u
rsi
v
e: use xs
t
rdu
p
() i
n
stea
d
of fix
e
d buffer
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-18
SZEDE
R
Gábor
RelNo
t
e
s
2
.
18:
minor
fix
to entry ab
o
u
t
dyn
a
mically
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-18
S
ZEDE
R
Gábor
t7406-su
b
module-upd
a
te: f
i
x broken &&-chains
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-18
Joh
a
nnes Schindelin
r
e
base --root: fix ame
n
d
i
ng root comm
i
t mess
a
ges
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-18
Todd
Z
ullinge
r
rebase --root: demonstrat
e
a bug while amendi
n
g r
o
ot
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-18
J
eff King
e
w
ah: ad
j
ust callers of ewa
h
_read_mma
p
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-18
Jeff K
i
ng
ewah_read_mma
p
: bounds-check mmap
reads
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-18
Kaartic Sivaraam
t3200: clarify descripti
o
n of --set-
u
pstream test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-18
Luis M
a
rsano
g
i
t
-credenti
a
l
-netrc: fix exit st
a
tus when tests
fail
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-18
Luis
M
arsano
g
i
t
-
credenti
a
l-netrc: use in-tree Git
.
pm for tests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-18
Todd
Z
ullin
g
er
git-cre
d
ential-n
e
trc: minor whitesp
a
c
e cleanup in te
s
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-15
E
ric Sunshine
Makefile: make N
O
_ICONV real
l
y mean "n
o
ic
o
nv"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-15
Junio C Ha
m
ano
tests: clean
a
fter SANITY t
e
sts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-14
St
e
fan Beller
t
5
5
26: test
r
ecursive submo
d
ules whe
n
f
e
tching mo
v
ed
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-14
Stefan Be
l
ler
submodul
e
:
fi
x
NULL co
r
r
ectn
e
ss in ren
a
m
e
d brok
e
n sub
m
od
u
le
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-14
M
e
ng-S
u
ng Wu
doc: update
t
he o
r
der
of t
h
e
syntax `g
i
t
m
erg
e
--
c
ontinue`
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-14
René Scharfe
bla
m
e
:
release strin
g
_list after
u
se in parse_colo
r
_
fie
l
d
s()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-14
Re
n
é Scharfe
merge-recursi
v
e
:
use
x
s
t
rdup()
instead of f
i
x
ed buffer
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-13
Junio C H
a
mano
G
it 2
.
18-rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-13
Junio
C
Ha
m
ano
Me
r
ge bra
n
c
h
'
j
k
/
index
-
pac
k
-maint'
commit
|
commitdiff
|
tree
2018-06-13
Jun
i
o C Hamano
Merge
branch 's
g
/completion
-
zsh-worka
r
ound'
commit
|
commitdiff
|
tree
2018-06-13
Ju
n
i
o C
H
amano
Merge branch 'sb/submodule
-
merge-in-
m
erge-recu
r
siv
e
'
commit
|
commitdiff
|
tree
2018-06-13
Junio
C
Hamano
Merge b
r
anch 'jk/sub
m
odule-fsc
k
-loose-fixup
'
commit
|
commitdiff
|
tree
2018-06-13
Ki
r
ill Smelkov
fetc
h
-
pack: test explicitly that -
-
al
l
can f
e
tch tag
.
.
.
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-13
Jere
m
y
L
inton
packfi
l
e: co
r
rect
z
l
i
b buffer hand
l
ing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-13
Elij
a
h New
r
en
Rel
N
otes
2
.
18: clarify where directory rename det
e
ction
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-13
R
o
b
e
rt P
.
J
.
Day
Use hyphenated "remote-trackin
g
br
a
nch" (
d
ocs and comments)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-13
Ævar Arnfjörð
Bjarmason
git-
c
redential-netrc
:
remove use of "autodie"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-12
L
u
k
e Diama
n
d
git-p4: a
u
to-size the
b
lock
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-12
Luke
Diamand
git-
p
4
: n
a
rrow the scope of exceptions caught
when
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-12
Luke Diam
a
n
d
git-p4: ra
i
s
e
exceptions f
r
o
m
p4CmdList based on error
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-12
Luke Dia
m
an
d
git-p4: better
e
rr
o
r re
p
o
r
ting
w
hen p4 fails
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-12
Luk
e
Diamand
git-
p
4
:
add
o
pt
i
on to
d
i
sa
b
le synci
n
g of p4/mas
t
er
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-12
Lu
k
e D
i
amand
git-
p
4: disable-rebase: allow set
t
in
g
t
his via configuration
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-12
R
o
ma
i
n
M
erland
git-
p
4
:
add options --commit and --disab
l
e-rebase
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next