repo.or.cz
/
alt-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'pw/add-p-recount'
2018-06-13
Elijah Newren
RelNotes 2
.
18: clarify wh
e
re
d
irectory
ren
a
me detecti
o
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-01
E
lijah Newr
e
n
RelNotes: r
e
m
ove duplicate release note
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
E
l
ijah Newr
e
n
t6036: pref
e
r test_when_finished to manual
c
lea
n
u
p
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Elijah Newren
t603
6
, t6042:
prefer test_cm
p
to sequenc
e
s of test
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
E
lijah Newren
t6036,
t6042: pref
e
r
t
est_path_is_file, tes
t
_path_is_missing
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Elijah Newren
t6036
,
t6042: use test
_
l
i
ne_count instead o
f
wc
-
l
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Elija
h
Newren
t603
6
,
t
6
0
4
2:
us
e
t
e
st_create_repo to keep
test
s
indep
e
ndent
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-25
Elijah Newren
rev-parse: check lookup
'
e
d co
m
m
it references for N
U
LL
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-20
Elijah Newren
merge-recursive: provide p
a
ir
of `unpack_t
r
ees_{sta
r
t
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
m
e
rge-recursive:
f
i
x
check for sk
i
p
a
b
ility of working
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
l
i
jah Newren
merge-
r
ecu
r
s
iv
e
:
make "Aut
o
-
merging
"
comment show for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elija
h
New
r
en
merge-recursive: fix remainder of was
_
dirty() to use
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
l
ijah Newren
merge-recursive: fi
x
was_tracked()
to quit lying with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah N
e
wren
t6046: testcases
c
h
e
c
king whe
t
her updates
can be skipped
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-recur
s
ive: avoid trigge
r
ing add_
c
ac
h
einfo error
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elij
a
h Newren
merge-recursive:
m
ov
e
more is_dirty handling
to merge_content
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
l
ijah
Ne
w
ren
merge-rec
u
rsive
:
impr
o
ve add_cacheinfo er
r
or ha
n
dlin
g
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merg
e
-
r
ecursive: avoid spurious
r
ename/rename conflict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elij
a
h N
e
wren
directory
r
ename detection: new testc
a
ses showcasing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
lija
h
New
r
e
n
m
e
rge-recursive:
fix remaining director
y
rename + dirty
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elija
h
N
ewre
n
m
erge-recursive
:
fix ove
r
writing dirty files invo
l
ved
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elija
h
Newren
merge-re
c
ursive: avoid
c
lobbe
r
i
ng untracked fil
e
s with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
l
ijah
N
e
wren
merge
-
re
c
ursive: apply necessary
m
odifications f
o
r
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah N
e
wren
merge-recursive: whe
n
comparin
g
file
s
, don't in
c
l
ud
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-r
e
cu
r
sive: chec
k
fo
r
file level co
n
f
l
i
cts
then
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah
N
ewren
merg
e
-
recursive:
add computa
t
ion of col
l
isions due
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Eli
j
a
h Newren
m
e
rg
e
-r
e
cur
s
ive: chec
k
f
or dire
c
tory level confli
c
ts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-rec
u
rsive: a
d
d get_directory
_
re
n
ames()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-02
E
lijah Newren
u
n
p
a
ck_t
r
e
es: fix breakage when o->src_index != o-
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-25
Elijah Ne
w
ren
Make r
u
n
n
i
ng
g
it und
e
r ot
h
e
r debugger-like program
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
El
i
jah Newren
m
e
rg
e
-recursive: m
a
k
e a helper
f
u
nction for cleanup
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
E
l
ija
h
N
e
wren
m
e
rge-recursive: split ou
t
c
ode for determining di
f
f_filepai
r
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elij
a
h
Newren
merge-
r
e
c
u
r
s
ive: make !
o
-
>
detect_ren
a
me
codepath more
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
E
l
ijah Newr
e
n
me
r
ge-recursive: fix
l
eaks of alloc
a
te
d
r
enames and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah N
e
wren
merge-recursive: intro
d
uc
e
new fu
n
ctions to handle
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah
Newren
merge-recur
s
ive
:
m
o
ve
t
he
get_renames() func
t
ion
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah
Newren
directory ren
a
me detectio
n
: tes
t
s for handl
i
ng
overwriting
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah
N
e
wren
directo
r
y rename d
e
tecti
o
n: tests for han
d
ling ov
e
r
writi
n
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah
N
e
wren
dir
e
ct
o
ry renam
e
detec
t
ion:
miscel
l
an
e
ous testcases
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newr
e
n
direc
t
o
ry re
n
ame
detection: t
e
stcases exploring possibly
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
directory renam
e
detection: more i
n
vo
l
ved edge/cor
n
er
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
directory rename detection: t
e
st
c
ases checking
w
h
ich
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elij
a
h
N
ewr
e
n
d
irectory rename detec
t
ion
:
files/directories in the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
direct
o
ry rename de
t
ecti
o
n: partia
l
l
y
r
enamed d
i
rect
o
r
y
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
E
l
i
jah Newren
directory re
n
ame d
e
tec
t
ion: testcase
s
to avoid taking
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newr
e
n
directory
rename detecti
o
n: directory
s
plitting testcases
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
directory rename detectio
n
: basi
c
t
e
stcases
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-09
E
l
ijah Newren
Docume
n
tation: nor
m
aliz
e
spel
l
ing of 'no
r
malised'
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-09
Elijah
N
ewren
D
o
c
um
e
ntation:
f
ix several one-charac
t
e
r
-
o
ff spelling
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elij
a
h N
e
wren
merg
e
-
r
e
cu
r
sive: e
n
sure we write upda
t
es
f
or dir
e
ctory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elijah Newren
mer
g
e-recursiv
e
: avo
i
d spurious re
n
am
e
/rename conf
l
ict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elijah Newren
directory ren
a
me
d
etection: new testcases showca
s
ing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
E
lijah Newren
me
r
ge-re
c
ursive:
f
ix
r
emaini
n
g directory rename + di
r
ty
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elij
a
h Newre
n
merge-rec
u
rsive: fix overw
r
iting d
i
rty files i
n
v
o
l
v
e
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
El
i
jah Ne
w
re
n
mer
g
e
-
recursiv
e
:
a
v
oid c
l
obbe
r
ing untracked files with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
E
l
ija
h
N
ew
r
en
merg
e
-recu
r
sive: apply ne
c
es
s
ary modifications
for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
El
i
j
ah Newr
e
n
m
erge-r
e
cursi
v
e: wh
e
n co
m
paring fi
l
es, don'
t
includ
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
E
l
i
jah Newren
merge-recursive: check for
f
ile
level
co
n
flicts then
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elij
a
h
Newren
merge-recursi
v
e: ad
d
computation of collisions
due
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
merge-r
e
cursi
v
e
: check
for
d
ir
e
c
t
or
y
level confli
c
ts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
merge-r
e
cu
r
sive: add
get_d
i
rectory
_
renames()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
me
r
ge-recursive: m
a
ke
a
helper function
for cleanup
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
El
i
jah Ne
w
ren
merge
-
recursive: s
p
lit o
u
t code for d
e
ter
m
ining diff_filepairs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
E
lijah New
r
en
merge-recursive: make !o->detect_r
e
name
c
odepath
m
ore
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elija
h
Ne
w
re
n
merge-recursive: fix leaks of al
l
o
c
ated renames and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
me
r
ge-
r
e
c
ursive: i
n
troduc
e
new func
t
ions to hand
l
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newre
n
merge-recursive: move the get_renames() functio
n
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
dire
c
tory rename detection: tests for handling o
v
erwriting
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah
Newre
n
di
r
ectory r
e
name detecti
o
n: t
e
sts f
o
r handling
o
verwriting
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
El
i
jah N
e
wren
directory r
e
name detecti
o
n
: miscellaneous tes
t
ca
s
es
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
E
lijah New
r
en
dir
e
ctory r
e
n
ame
d
etectio
n
: t
e
st
c
ases exploring possibly
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah New
r
en
d
i
rect
o
ry re
n
ame detect
i
on:
more invol
v
ed edge/corne
r
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah N
e
wren
directory r
e
n
a
m
e detection: testcas
e
s
c
hecking which
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
director
y
rename detec
t
io
n
: fi
l
e
s/directories in
t
he
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
direc
t
ory rename detection
:
partially renamed d
i
rectory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
E
l
ij
a
h Newren
directory r
e
name detection
:
testcases
t
o
avoid taki
n
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah
N
ewre
n
direct
o
ry rena
m
e
detect
i
o
n
: direc
t
ory split
t
ing
testcases
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
El
i
j
ah
N
ew
r
en
directory renam
e
detect
i
on: basic t
e
s
t
c
ases
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-01-19
Elijah Newren
merge-rec
u
rs
i
ve: add explan
a
t
ion fo
r
sr
c
_entry
a
nd
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-01-19
Elija
h
Newren
merge-recurs
i
ve: f
i
x logic
orderi
n
g
i
s
sue
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-01-19
Elijah Newren
Tighten and co
r
rec
t
a fe
w
t
estcas
e
s for mergin
g
and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-22
El
i
jah Newren
merge-recursive: avoid incorporating unc
o
mmitt
e
d c
h
anges
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-22
E
l
ijah New
r
en
move index_has_changes
(
) from
b
u
i
ltin/am
.
c to merge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-22
Elijah Ne
w
re
n
t6044:
recursive can silently i
n
cor
p
orate dirt
y
changes
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-05
Elijah New
r
en
strbuf: remove unused
s
t
ripspace function alias
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-27
E
l
ijah Newren
merge
-
recursive: ignore_case sh
o
u
ldn'
t
reject intentional
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
Elijah Newren
sequ
e
ncer: show rename
progress d
u
ring
cherry picks
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
Elija
h
Newren
diff: remove
s
ilent clamp of renameLim
i
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
Elij
a
h N
e
wren
progre
s
s: fix progress
meters when
d
e
a
ling with
lots
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
Elijah Newren
me
r
ge-recursive
:
handle addition of s
u
b
mo
d
u
l
e on
o
u
r
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-14
Elijah
N
ewren
sequencer:
wa
r
n
w
hen
internal merge
m
ay be suboptimal
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Eli
j
ah Newren
t6044:
new merge
testca
s
es for when index does
n
't match
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah N
e
wren
merge
-
octopu
s
: abo
r
t if i
n
dex
does
n
ot
m
atch HEAD
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah Newren
builti
n
/me
r
ge
.
c
: f
i
x a bug with trivial merg
e
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah
N
ewren
t7605: add a
testcase demonstrating a bug wi
t
h trivial
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah Ne
w
re
n
merge-rec
u
r
sive: do not check wo
r
king copy whe
n
c
reating
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah New
r
en
merge-recursiv
e
:
r
em
o
v
e dupl
i
c
ate code
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah New
r
en
me
r
ge-recursive: Don't r
e
-so
r
t a list
w
h
ose order we
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah Newren
merge-r
e
cursive: Fix vi
r
tu
a
l
merge base
f
or rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah Newren
t6
0
36:
criss-cross + renam
e
/renam
e
(1to2)/ad
d
-dest
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next