repo.or.cz
/
git
/
raj.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
merge-recursive: use xstrdup() instead of fixed buffer
2018-06-18
René Sch
a
rfe
me
r
ge-recursive
:
use xstr
d
up
(
) inste
a
d
o
f fixed
buffer
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-05-08
Elijah
Newren
merge-recursive: fix
check fo
r
s
k
ipa
b
ility o
f
worki
n
g
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-05-08
Elija
h
Newren
merge-recurs
i
v
e
:
make
"
Auto-m
e
rging
"
com
m
en
t
sh
o
w for
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-05-08
El
i
jah Newren
merge-
r
ecursi
v
e: fix remai
n
der of wa
s
_di
r
ty() to use
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-05-08
Elija
h
Newren
merge-recur
s
ive: fix was_tracked() to
q
uit lying wi
t
h
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-05-08
Eli
j
a
h N
e
wr
e
n
t6046: testc
a
ses checkin
g
whether
updates can be
sk
i
pped
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
m
erge-re
c
ur
s
ive: avoid triggering
a
dd_ca
c
heinfo
e
r
ror
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-05-08
Elij
a
h
Newren
m
erge
-
r
ecursive: move more is_dirty hand
l
i
ng to mer
g
e_
c
on
t
ent
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-05-08
E
l
i
jah N
e
wren
mer
g
e-recursive: improve add_cacheinfo
e
rror ha
n
dlin
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-05-08
Eli
j
ah Newren
merge-recur
s
ive
:
avoid
spurious rename/re
n
ame confl
i
ct
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
di
r
e
ctory
renam
e
detection:
n
ew testcases
s
h
o
wcasing
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-recursive:
f
ix remaining
d
i
r
e
c
tory rename + dirty
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
m
erge-recursive: fix overwritin
g
dirt
y
f
iles
i
nvo
l
ved
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-05-08
Elij
a
h Newren
merge
-
r
ecursi
v
e
: avoid cl
o
b
bering untracked
f
iles with
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Ne
w
ren
merge-re
c
ursive:
a
pply necessary modific
a
tions
f
or
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merg
e
-
recursive: when c
o
mparing
files,
d
o
n't include
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
m
erge-recursive:
check
f
or f
i
le level c
o
nf
l
icts
t
h
en
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-
r
ecursive:
add c
o
mput
a
tion of
c
ollis
i
ons due
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-recursive
:
ch
e
ck
for directory l
e
vel con
f
l
i
cts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-05-08
E
l
ijah New
r
en
merge-recursive: a
d
d get_di
r
ectory_rename
s
()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elijah New
r
en
me
r
ge-
r
ecursive:
mak
e
a
helper fu
n
c
tio
n
for cleanup
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Ne
w
ren
merge-recursive: split o
u
t code f
o
r determ
i
n
i
ng dif
f
_filepairs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-20
E
l
i
j
ah Newren
merge
-
recursive:
m
ake !o->detect_rename codepat
h
more
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
merge-recursi
v
e: fix l
e
aks of
allocat
e
d renames an
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
merge-
r
ecursive: introd
u
ce
n
ew fun
c
tio
n
s to h
a
nd
l
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
m
e
rge-
r
ecursive: move
the get_renam
e
s
(
) function
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
d
ire
c
tory rename d
e
t
e
ction: tests for
h
a
ndling overwriti
n
g
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-20
Eli
j
ah Newren
direc
t
ory r
e
na
m
e
d
etection: tests
for handli
n
g ov
e
r
w
ri
t
ing
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elijah New
r
en
directo
r
y
r
ename detection
:
m
isce
l
laneous
testcases
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elijah New
r
en
di
r
ector
y
rename detectio
n
: testca
s
es explorin
g
poss
i
bl
y
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Ne
w
ren
d
i
rect
o
ry rename detection
:
m
ore i
n
volved
e
d
ge/
c
or
n
er
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elijah
Newren
d
irect
o
ry
r
ename d
e
tec
t
ion: testcases checking which
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
direct
o
r
y re
n
am
e
detect
i
on: files/directories in the
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Ne
w
ren
director
y
rena
m
e detection:
partially ren
a
med directory
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
directory renam
e
d
e
t
e
ction:
testcases t
o
a
v
oi
d
taking
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-20
El
i
j
a
h Newr
e
n
directo
r
y rename detection:
d
irectory splitting testcases
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
directory rename detectio
n
: basic testcases
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-11
Junio C Ham
a
no
Merge
b
ranch 'svn/au
t
hors-prog-2' of g
i
t://bogomips
.
.
.
commit
|
commitdiff
|
tree
2018-04-11
J
u
nio
C
Hamano
Re
v
ert "Merg
e
branch 'en/
r
ename-directory-d
e
t
e
ction'"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-11
J
u
nio C H
a
mano
T
he
t
h
ird batc
h
for 2
.
18
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-11
Ju
n
io C
Hamano
Merge bran
c
h 'eb/cred-helper-
i
gnore-sigpipe'
commit
|
commitdiff
|
tree
2018-04-11
Juni
o
C H
a
m
ano
Me
r
ge branch
'
lv/tls-1
.
3
'
commit
|
commitdiff
|
tree
2018-04-11
Junio C H
a
mano
Merge
b
r
an
c
h 'pk/test-avoid-
p
ipe
-
h
iding-exit-sta
t
us'
commit
|
commitdiff
|
tree
2018-04-11
Junio C Hamano
M
e
r
g
e
b
ranch
'rs/
s
ta
t
us-with-removed-s
u
bmodule'
commit
|
commitdiff
|
tree
2018-04-11
Junio C Hama
n
o
Merge branc
h
'nd/combine
d
-test-he
l
per'
commit
|
commitdiff
|
tree
2018-04-11
Junio C Hama
n
o
Merg
e
bra
n
ch 'sb/
p
ackfiles-i
n
-re
p
ository'
commit
|
commitdiff
|
tree
2018-04-11
Junio
C
H
amano
Merge branch 'sb
/
object-
s
to
r
e'
commit
|
commitdiff
|
tree
2018-04-11
Junio C
H
ama
n
o
Merge b
r
a
nch
'
jc/test-must-be-e
m
pty'
commit
|
commitdiff
|
tree
2018-04-11
Jun
i
o C
H
amano
Merge branch 'cc/perf-aggregate-
s
ort'
commit
|
commitdiff
|
tree
2018-04-11
Junio C H
a
man
o
Merge branch
'
a
b/doc-hash-brokenness'
commit
|
commitdiff
|
tree
2018-04-11
Ju
n
io C Hamano
M
e
rg
e
branch
'
bc/h
a
s
h-ind
e
pendent-tests'
commit
|
commitdiff
|
tree
2018-04-11
J
u
nio C Hamano
Merge bran
c
h
'
ab/dro
p
-
c
ontrib-examples'
commit
|
commitdiff
|
tree
2018-04-10
Ju
n
io
C
Ha
m
ano
T
h
e s
e
c
o
nd batch for 2
.
1
8
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-10
Junio C Hamano
M
e
rge branch
'
y
s/b
i
sect-obje
c
t-i
d
-missing-conve
r
si
o
n
.
.
.
commit
|
commitdiff
|
tree
2018-04-10
Junio C Ha
m
ano
Merge
b
ranch 'yk/fi
l
ter-bran
c
h-non-committish-re
f
s
'
commit
|
commitdiff
|
tree
2018-04-10
J
u
nio C H
a
mano
Merge
b
r
an
c
h 'nd/t
r
ace-with
-
env'
commit
|
commitdiff
|
tree
2018-04-10
Junio C Ham
a
no
Merge
b
ranch 'nd/pars
e
opt-com
p
letion-
m
o
r
e'
commit
|
commitdiff
|
tree
2018-04-10
Junio C Hama
n
o
M
erge branc
h
'ds/bsearch-hash'
commit
|
commitdiff
|
tree
2018-04-10
J
u
nio
C
H
a
m
ano
Merge br
a
nch 'ws/re
b
ase-p
'
commit
|
commitdiff
|
tree
2018-04-10
Junio C Hamano
Merge branch '
j
k/diff-highligh
t
-graph-fix'
commit
|
commitdiff
|
tree
2018-04-10
Junio C Hamano
Merge b
r
anch 'nd/remov
e
-ignore
-
env-fiel
d
'
commit
|
commitdiff
|
tree
2018-04-10
J
u
nio C Hamano
M
e
r
g
e branch 'ps/contains-id
-
er
r
o
r
-message
'
commit
|
commitdiff
|
tree
2018-04-09
Juni
o
C Hamano
The first batch
f
or 2
.
18 cycle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-09
Junio
C
H
a
mano
Merge
b
ranch 'tg/s
t
ash-untra
c
ked-with-pathspec-fi
x
'
commit
|
commitdiff
|
tree
2018-04-09
Junio C Hamano
Merge branch 'nd/worktree-prune'
commit
|
commitdiff
|
tree
2018-04-09
J
unio
C
Hamano
Merge branch 'bc/o
b
jec
t
-id'
commit
|
commitdiff
|
tree
2018-04-09
Junio C
Hamano
M
er
g
e branch 'ma/shortlog
-
r
ev
p
arse'
commit
|
commitdiff
|
tree
2018-04-09
Junio C H
a
mano
Mer
g
e branch 'ab/ins
t
all-symlinks'
commit
|
commitdiff
|
tree
2018-04-09
J
unio C Haman
o
Merge branch 'ml/filter-b
r
anch-no-op-error'
commit
|
commitdiff
|
tree
2018-04-09
J
u
nio C
H
am
a
no
Merge branch 'a
b
/pcre-v2'
commit
|
commitdiff
|
tree
2018-04-09
J
unio C Hamano
Merge
b
r
a
nch 'ti/fetch-everything-l
o
cal-optim'
commit
|
commitdiff
|
tree
2018-04-09
Junio C
H
a
ma
n
o
Merge
b
r
a
nch 'en/rename-dir
e
cto
r
y
-
detection'
commit
|
commitdiff
|
tree
2018-04-02
Juni
o
C Hamano
Git 2
.
1
7
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-02
Junio C Ham
a
no
M
e
rge t
a
g 'l
1
0n-2
.
1
7
.
0-
r
nd1'
of git://githu
b
.
com/git
.
.
.
commit
|
commitdiff
|
tree
2018-04-02
Junio C Hamano
Merge branch '
p
w
/
ad
d
-p-si
n
gle'
commit
|
commitdiff
|
tree
2018-04-01
Ævar
A
rnf
j
örð Bja
r
m
a
s
o
n
add -p:
fi
x
2
.
1
7
.
0-r
c
* regression due
to
moved code
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-29
Junio C Hamano
Me
r
ge branch 'jh/partial-clone'
commit
|
commitdiff
|
tree
2018-03-29
J
onatha
n
Ni
e
der
u
p
load
-
pack: disable
o
bject filtering when dis
a
bled
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-29
Erik
E
B
rady
credent
i
al: i
g
no
r
e SIGPIPE when writing to credent
i
al
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-29
Log
a
na
d
en Velvindron
h
t
tp:
allow use
of TLS 1
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-28
R
ené Scharfe
subm
o
dule
:
chec
k
for NULL
r
eturn of get_submodule_ref
_
st
o
r
e
(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-28
J
un
i
o C
H
amano
Git 2
.
17-rc
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-28
Junio
C
Hamano
M
e
rge branch 'tg/st
a
sh-doc-typofi
x
'
commit
|
commitdiff
|
tree
2018-03-28
Jun
i
o C Hamano
Merge b
r
a
nch 'pc/submodule-helpe
r
'
commit
|
commitdiff
|
tree
2018-03-28
Ju
n
io C H
a
mano
Merge bran
c
h 'nd/par
s
eopt-comp
l
et
i
on'
commit
|
commitdiff
|
tree
2018-03-28
Pratik
Karki
test: avoid pip
e
s in g
i
t
r
el
a
ted commands for t
e
s
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-28
Stefan
B
eller
submodul
e
deinit: handle non
existing path
s
pe
c
s gracefully
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-28
Thomas Gummerer
git
-
s
tash
.
tx
t
:
remo
v
e extra
s
qu
a
re bracket
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-28
Ævar Arnfjörð Bjarmason
doc
h
ash-f
u
n
c
tion-transit
i
on:
c
larif
y
what SHAtte
r
ed
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-28
Ævar Arnfjör
ð
Bjarmaso
n
doc
hash-func
t
io
n
-transit
i
o
n: clarify
h
ow
o
lder gi
t
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-28
SZEDER Gábor
test_
m
ust_be_
e
m
p
ty: simp
l
ify
f
i
le existen
c
e ch
e
ck
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-28
Ch
r
i
st
i
a
n
C
o
ud
e
r
p
erf/ag
g
regate: add -
-
sort-by=regress
i
on option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-28
Ch
r
istian Couder
perf
/
ag
g
rega
t
e: add di
s
play_dir
(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-27
Ng
u
yễ
n
Thái Ngọc Duy
t
/helpe
r
:
merge test-write-cac
h
e into test-
t
ool
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-27
Ng
u
yễn Thái
N
g
ọ
c
Duy
t/he
l
per
:
merge tes
t
-
w
ildmatch in
t
o
t
e
st-tool
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-27
Nguyễn Th
á
i
N
gọc Duy
t/helper: merge tes
t
-urlmatch-
n
ormali
z
a
t
ion
into
t
e
st
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-27
Nguyễn Thái Ngọ
c
Duy
t/helpe
r
: m
e
rge test-subprocess i
n
to test-tool
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-27
Nguyễ
n
Thá
i
Ngọ
c
Duy
t/helper: merge test-
s
ubmodule-config into test-tool
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-27
N
gu
y
ễn Thái Ngọc Duy
t/helper: merge test-str
i
ng-list into t
e
st-to
o
l
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-27
Ng
u
yễ
n
Thái Ngọc Duy
t/hel
p
er: merge test-strcmp-offset
into test
-
tool
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next