repo.or.cz
/
git
/
debian.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
config.mak.uname: resolve FreeBSD iconv-related compilation warning
2018-06-13
El
i
ja
h
Newren
R
e
lNotes
2
.
18: clarify
w
h
ere
d
ire
c
tory rename detection
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-01
Elijah N
e
wre
n
RelNotes: remove duplicate re
l
ease
n
ote
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-25
Elijah Newren
rev-
p
arse: check
lookup'ed commit ref
e
r
e
nces for N
U
LL
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-20
Elijah Newren
merge
-
r
ecursive: pr
o
v
i
de pair
of `unpack_tr
e
es_
{
start
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elija
h
Newren
mer
g
e-recur
s
ive: fix check for skipability of workin
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elij
a
h Newren
merge-recursive: make "Auto-mergin
g
" comment
s
how for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elija
h
Newren
merge-recursi
v
e
:
f
ix remaind
e
r of was_dirt
y
(
) to
u
se
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Eli
j
ah
Newren
merge-recursi
v
e: fix was_tracked() t
o
quit l
y
ing with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newre
n
t6046
:
tes
t
cases checking whether updates
c
a
n be ski
p
ped
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Ne
w
ren
m
erge-recursive
:
avoid triggering add_cachei
n
fo e
r
ror
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elija
h
Newren
merge
-
recu
r
sive: move more is_dirty
h
andli
n
g
to merge_content
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah
Newren
mer
g
e-r
e
cursive: improve a
d
d_cacheinfo erro
r
ha
n
dling
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
l
ijah Newren
merge-recursi
v
e:
a
void spur
i
o
u
s
rename/rename c
o
nflict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah
Newren
d
i
rectory rename
d
etection: new te
s
t
c
a
s
e
s s
h
owcasing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
El
i
j
ah New
r
en
merge-recursiv
e
:
f
ix remaining direc
t
ory r
e
name +
d
irty
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elija
h
Newren
merge-
r
ecursive
:
fix ov
e
r
w
riting dirty f
i
les i
n
volved
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
m
e
rge-recursive:
a
void clo
b
bering untracked files wi
t
h
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah
N
e
wren
merge-recursive: appl
y
nece
s
sary modifications
for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elij
a
h Newren
merge-recurs
i
ve: when compari
n
g
file
s
, don't include
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-r
e
cursive: ch
e
ck
for file
l
evel co
n
flicts then
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
El
i
j
a
h Newren
merge-recur
s
ive:
a
dd computat
i
on of collisions due
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newr
e
n
merge-recur
s
ive: ch
e
ck for
d
i
r
e
ctor
y
lev
e
l conflicts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Ne
w
ren
merge-recursive
:
add get_directory
_
re
n
ames
(
)
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-02
Elijah Newren
u
np
a
ck_tr
e
e
s: fix breakage when o
-
>src_i
n
d
e
x != o-
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-25
E
l
ij
a
h Newren
Ma
k
e running git under other debugger-like
programs
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
merge-recurs
i
ve: make a helper funct
i
on for c
l
eanup
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
merge-r
e
cursive: split out
c
ode fo
r
det
e
rmining diff_filepa
i
rs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newr
e
n
merge-recursive: m
a
ke !o->d
e
tect_rename
c
odepath more
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
El
i
jah Newren
merge
-
recursive
:
f
i
x l
e
aks
o
f alloc
a
ted renames
and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah N
e
wren
mer
g
e-recur
s
iv
e
: introdu
c
e new fun
c
t
ions to ha
n
dle
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Ne
w
re
n
merge-recursive: move the get_r
e
names(
)
funct
i
on
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah
Newren
directory rename detection: tests for handling
overwr
i
ting
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
di
r
ectory
rename dete
c
ti
o
n: tests
f
or
h
an
d
ling overwriting
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
El
i
jah
Newr
e
n
dir
e
ctory rename de
t
ection: misce
l
laneous testcases
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
d
i
re
c
tory rename det
e
c
t
i
on: t
e
stcases exploring possibly
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elija
h
Newren
directory r
e
n
a
m
e
detect
i
on
:
more involved
edge/corner
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
di
r
ectory rename dete
c
t
i
on: testcases checking which
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Eli
j
ah
Newren
director
y
rename d
e
tection:
f
iles/directories i
n
the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elija
h
Newre
n
d
irectory r
e
n
a
m
e det
e
cti
o
n:
p
artially
r
en
a
med di
r
ectory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Eli
j
a
h
New
r
en
dire
c
tory rename
detection: testcases
t
o avoid takin
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Eli
j
ah
Newren
direct
o
ry
r
ename det
e
ction: director
y
splittin
g
testcases
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
E
l
ijah Newren
dire
c
t
o
r
y
rename d
e
tection: basic testcases
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-09
Elijah Newr
e
n
Documentation
:
norm
a
lize spe
l
ling
of 'normal
i
s
ed'
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-09
El
i
jah New
r
e
n
Documenta
t
ion: fix several on
e
-charac
t
er-off spelli
n
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elijah New
r
en
m
erge-recurs
i
ve: e
n
sure we
write updates for dir
e
ctory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elijah Newren
merge-recursive: avoid
s
purious r
e
name/ren
a
me
c
onflict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elijah N
e
w
r
en
dir
e
cto
r
y rename de
t
ecti
o
n: new testcases
s
howcasing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Eli
j
a
h Newren
merge-recursive: fix remaining direc
t
or
y
rename
+
dirty
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
E
lijah
Newren
merge-recu
r
si
v
e: fix overwrit
i
ng di
r
t
y
files in
v
olved
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elijah Newren
m
e
rge-recursive: avoid
c
lo
b
bering untrac
k
ed files with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
E
l
ijah N
e
wren
m
erge-recursive: app
l
y necessary modifications for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah New
r
en
merge-
r
ecursive: when
c
omparin
g
f
iles,
d
o
n't include
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
merge-recur
s
ive: check for file level co
n
flicts then
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
merge-recursive: add computation of collisions due
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Eli
j
ah Newren
m
erge-recursive: ch
e
ck
f
or
d
irectory level conflicts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah
Ne
w
ren
mer
g
e-re
c
ursive:
a
d
d
get_director
y
_rena
m
e
s()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah N
e
wren
merge-re
c
urs
i
ve:
make a helper function f
o
r clean
u
p
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
E
l
i
j
a
h Newre
n
merg
e
-
r
ecursive: split out
c
ode for
d
e
termining
d
iff
_
filepairs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
E
lija
h
Newren
merge-recursive:
mak
e
!o->det
e
c
t
_r
e
name codepath more
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
E
lijah Newren
merge-recursive
:
f
ix
le
a
ks of allocated
r
en
a
mes
a
nd
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
E
lijah Newren
mer
g
e-recursive: intr
o
duce new fun
c
ti
o
ns to
ha
n
dle
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
merge-
r
e
c
u
rsive:
m
o
v
e
the ge
t
_renam
e
s
() function
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
directory rename detection: tests for handling over
w
r
i
ting
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
El
i
jah Newren
directory rename detect
i
o
n
: tes
t
s for handling
o
verwriting
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
E
l
ijah Newren
dire
c
tory
r
ename detection: misc
e
llaneou
s
tes
t
cas
e
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
El
i
jah Newren
directory
r
e
name de
t
ec
t
ion: t
e
stcases
exploring possib
l
y
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah
N
ewren
di
r
e
ctory rename dete
c
tion: more inv
o
lved
e
dge/cor
n
er
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
directory r
e
name
d
e
t
ect
i
on: test
c
a
s
es checking
whic
h
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
E
l
i
jah
N
ewren
dir
e
ctory re
n
ame de
t
ection: file
s
/directories in
t
he
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newre
n
di
r
ect
o
r
y rename detection: p
a
r
t
ially renamed directory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
El
i
jah New
r
en
directory
r
e
name detection: testcases
t
o avoid taking
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Ne
w
r
e
n
d
i
re
c
t
o
ry r
e
name
detection: directory spl
i
tting testcases
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Eli
j
ah
N
ewren
d
irect
o
r
y
rename det
e
ction: basic testcases
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-01-19
Eli
j
a
h Ne
w
r
en
merge-re
c
u
r
sive: add explanatio
n
for src_entry and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-01-19
Elijah New
r
en
merge-re
c
urs
i
ve: fix logic or
d
ering issu
e
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-01-19
Elija
h
Newren
Tight
e
n and correct a f
e
w testcase
s
for
merging and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-22
E
l
ijah Ne
w
ren
m
e
rge
-
recursive: avoid incorporating un
c
om
m
itted changes
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-22
El
i
jah New
r
en
move index_has_c
h
ange
s
()
from
b
uilt
i
n/a
m
.
c to merge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-22
Elijah Newren
t
6044: recur
s
ive c
a
n
silen
t
ly incorporate dirty changes
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-05
Elijah
Ne
w
ren
s
t
rbuf: rem
o
ve unuse
d
strips
p
ace f
u
n
c
t
i
on alias
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-27
El
i
jah Ne
w
ren
merge
-
recursive: i
g
nore_case shouldn't reject intentional
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
Elijah
N
ewren
seq
u
en
c
er: show r
e
name
p
rogres
s
d
uring che
r
ry p
i
cks
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
E
l
i
jah
N
ewren
d
iff:
r
em
o
ve s
i
lent clam
p
of re
n
a
m
eLimit
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
Elijah New
r
en
progress: fi
x
progr
e
ss
m
eters when dealing with lots
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
E
l
ijah Newren
merge-rec
u
rsive: ha
n
dle addition of submodule on
our
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-14
Elijah New
r
en
sequencer: warn wh
e
n i
n
ternal
m
e
r
g
e
may be suboptimal
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah Newren
t6044: new me
r
ge t
e
stcase
s
f
o
r when index doesn't match
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah Newren
merg
e
-octopus: abor
t
if index does not match
HEAD
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah Newren
b
uiltin/merge
.
c
: fix a b
u
g
with trivial mer
g
es
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah New
r
en
t7605: add a
te
s
t
ca
s
e de
m
onst
r
ating a bug
with
t
rivial
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah N
e
wr
e
n
merge-recursive: do not check worki
n
g
copy wh
e
n creating
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah Newren
mer
g
e-recursi
v
e: remov
e
duplicate code
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
Newren
merge
-
rec
u
r
s
ive: Don
'
t re-sort
a
list
w
hose
o
rder we
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recu
r
sive: Fix
v
irtual merge base for
ren
a
me
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah Newren
t6036: cris
s
-cro
s
s + rename/rename(1to2)/add-dest
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newre
n
merge
-
r
e
cursive: Avoid unne
c
essary
f
ile rewrites
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h Newren
t602
2
:
A
ddition
a
l te
s
ts ch
e
cking for unne
c
essary update
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
ewr
e
n
m
e
rge-recursive
:
Fix spurious
'refusing
t
o lose
untracked
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6
0
22: Add tes
t
case for s
p
uri
o
u
s
"refusing to lose
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah Newren
mer
g
e-
r
ecursive
:
Fix
working co
p
y handling
f
or rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next