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
sequencer: fix "rebase -i --root" corrupting author header
2018-06-13
Elijah Newre
n
RelNotes 2
.
18: cl
a
r
i
fy w
h
ere directo
r
y rename detection
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-01
Elijah N
e
wren
RelN
o
tes: remove duplicate
release
note
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-25
Elij
a
h Newren
rev-parse: check l
o
o
kup'ed commit r
e
f
ere
n
ces for
N
U
L
L
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-20
Elijah
N
e
wren
merge-recur
s
ive: provide pair
of `unpack_t
r
ees_{start
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elija
h
Newren
merge-recursive: fix chec
k
for sk
i
pability of wor
k
i
n
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
l
ijah Newren
merge-recursive: make "Auto-merging" commen
t
show for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elij
a
h
N
e
wren
mer
g
e
-r
e
cursive: fix
r
ema
i
nder of w
a
s_di
r
ty() to use
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merg
e
-r
e
cursi
v
e
:
f
ix was_tra
c
ked()
to q
u
it l
y
ing wit
h
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
t6046
:
t
e
stcases chec
k
ing
whethe
r
u
p
dates can be ski
p
p
ed
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
l
i
jah
N
ewren
merge-recursive: avoid triggeri
n
g add_c
a
cheinfo error
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
li
j
a
h
Newren
merge-recurs
i
ve: move more is_d
i
rt
y
h
a
ndling to merge_conten
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
El
i
ja
h
Newre
n
m
e
rge-
r
ecursiv
e
: impro
v
e add_cacheinf
o
error
ha
n
dling
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-
r
ecurs
i
ve: avo
i
d
s
purious
ren
a
me/r
e
nam
e
c
onflict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
dire
c
to
r
y r
e
name detection: new te
s
t
ca
s
es show
c
asing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah
Newren
merge-recursive:
fix remaining
d
irectory
r
ename
+ dirty
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
l
ij
a
h
N
ewren
m
e
rge-recursive: fix overwriting d
i
r
ty
files involved
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Eli
j
ah Newren
merge-recursive: a
v
oid
clobberi
n
g untracke
d
files with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
m
e
rge
-
recursive
:
a
ppl
y
nece
s
sary m
o
difications for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elij
a
h Newre
n
merge-r
e
cursiv
e
: whe
n
c
o
m
parin
g
files
,
do
n
't include
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
El
i
jah
N
ewren
merge-recursive:
c
heck for file lev
e
l confli
c
ts the
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elij
a
h
Newren
merge-re
c
u
rsive: add computation of
c
ollisi
o
n
s due
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
m
erge-recursive: check for direc
t
ory level conflicts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah
Ne
w
ren
merge-recursive: ad
d
get_directory_renames()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-02
E
lijah Newre
n
unpack_t
r
e
es: fix b
r
eakage whe
n
o->src_
i
n
dex != o-
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-25
Eli
j
a
h
Newre
n
Mak
e
runni
n
g git u
n
der other debugger-
l
ike pro
g
rams
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
merge-
r
ecursive: m
a
k
e
a
helper functio
n
for clean
u
p
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Eli
j
ah Newren
m
er
g
e
-
re
c
ursive: s
p
lit
o
ut code for de
t
e
r
mini
n
g
diff_filepairs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
m
e
rge-recursive: mak
e
!o->de
t
ect_r
e
name codep
a
t
h
more
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
E
lijah Newren
merge-recu
r
sive:
fix leaks o
f
allocated ren
a
mes and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elij
a
h
New
r
en
merge-
r
ecursive:
introduce
n
ew functions to handle
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
merge-
r
ecursive: move the get_renames() function
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
direc
t
ory ren
a
me d
e
t
ec
t
ion:
t
ests for han
d
ling ov
e
rwriting
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elij
a
h Newren
dir
e
ctory
r
en
a
me detection: tests fo
r
h
a
ndling o
v
erwrit
i
ng
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah N
e
wren
d
irectory
r
ena
m
e detection: miscel
l
a
n
eous tes
t
cases
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Eli
j
ah Newren
directory rename
d
e
tection: t
e
stcases e
x
pl
o
ri
n
g po
s
sibly
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
E
l
ijah Ne
w
ren
directory rename detectio
n
: more involved ed
g
e/corner
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah
N
ewren
directory rename
detect
i
on: t
e
st
c
ases checkin
g
which
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
E
lijah Newren
direc
t
ory rename detection: files/directories i
n
the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
directory ren
a
me detection: partially renamed
directo
r
y
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
director
y
ren
a
m
e
d
e
tection: testcases to avoid
taking
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
directory renam
e
detection:
di
r
e
c
tory
splitting
t
estc
a
ses
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elij
a
h Newren
direc
t
ory re
n
ame de
t
ection
:
basic
te
s
t
c
a
ses
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-09
Elijah N
e
wren
D
o
cumentation: normal
i
ze spelli
n
g of
'
norma
l
ised'
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-09
Elijah Newren
D
ocumentation: f
i
x se
v
eral one-char
a
cter
-
o
ff sp
e
lling
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elijah Newren
merg
e
-recursive: ensure we write updates f
o
r directory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
E
lijah Newren
merge-recursive:
avo
i
d spu
r
ious rename/rename conflict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elijah Newren
directory rename detection: new testcases showca
s
ing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elijah Newren
merge-recursive: fix remai
n
ing director
y
r
ena
m
e + dirty
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
E
l
ijah Newren
me
r
ge-recursive: fix o
v
erw
r
iting
dirty files involved
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elijah N
e
wren
merge-recursive: avo
i
d
c
l
o
b
ber
i
ng untracked files with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elijah Newre
n
mer
g
e-recursive: apply n
e
c
e
ssary
modif
i
cat
i
ons for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newre
n
merge-recursive: when comparin
g
files, don't
i
nclude
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Eli
j
ah Newre
n
merge-recursive: check for file level conf
l
icts
t
hen
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
E
lijah Newren
merge-recursive: a
d
d computation of collisions due
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah
Newre
n
merge-recursi
v
e
: check for directo
r
y level conflicts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
m
erge-recursive: add get_di
r
ectory_re
n
ames()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
E
lijah New
r
en
m
e
rge-recursive:
make a he
l
pe
r
fu
n
cti
o
n for cleanup
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
m
erge-recursi
v
e: spl
i
t out
c
ode
for
determining d
i
f
f_filepairs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elij
a
h Ne
w
ren
merge-recursiv
e
:
m
ake
!
o-
>
det
e
c
t
_rename codepath more
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elija
h
New
r
en
merg
e
-r
e
cursive: fi
x
leaks of allo
c
ated rena
m
es and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
mer
g
e-re
c
u
r
sive: introduce new functions to handle
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
merge-r
e
cursive: move the get_rename
s
()
func
t
ion
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah
Newren
directory r
e
nam
e
detection: t
e
sts
f
or handling overwriting
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
directo
r
y rename
d
etection:
t
e
sts
f
or
h
andling overwritin
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Eli
j
ah
Newren
directory r
e
name detection: miscellaneous
testcases
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
directory rename detection: testcases
e
xp
l
oring p
o
ssib
l
y
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elija
h
Ne
w
ren
d
i
rec
t
o
r
y rename d
e
tection: more involved edge/co
r
ne
r
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
director
y
rename det
e
ct
i
on: tes
t
c
ases checki
n
g wh
i
c
h
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elij
a
h Newre
n
directo
r
y
rename d
e
tectio
n
: files/directories in the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
directory
r
ename
det
e
ction
:
parti
a
l
l
y renamed director
y
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
direct
o
ry rename
d
e
tec
t
ion: testcas
e
s to
avoid
t
aking
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Eli
j
ah Newren
directory ren
a
me detec
t
io
n
: director
y
split
t
ing testca
s
es
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elij
a
h Ne
w
r
en
directory rename
d
e
te
c
tion: basi
c
te
s
tcase
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-01-19
Elijah
N
ewren
m
erge-rec
u
r
sive
:
add explanati
o
n for sr
c
_entry and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-01-19
Elij
a
h Newr
e
n
m
erge-re
c
ursive: fix logic o
r
d
e
r
i
ng issue
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-01-19
Elijah New
r
en
T
i
ght
e
n and cor
r
e
ct a
few
testcases
f
or me
r
ging
and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-22
E
l
ijah Newren
merge-
r
ecursi
v
e: avoid incorporating
u
ncommitted
changes
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-22
El
i
j
a
h Ne
w
ren
m
ove index_has_changes() from builtin/am
.
c
to m
e
rge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-22
Elijah Newren
t6044: re
c
ursiv
e
c
an silently incorporate dirty changes
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-05
Eli
j
ah N
e
w
re
n
strbuf:
r
emove
unused s
t
r
i
ps
p
ace
fun
c
tion alias
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-27
E
l
ij
a
h N
e
wren
merge-
r
ecursive: ignore_
c
ase sho
u
l
d
n't reje
c
t intentional
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
Elija
h
Newren
sequencer: sh
o
w rename progress during cher
r
y picks
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
Elijah Ne
w
ren
di
f
f: remove
s
ilent clam
p
of r
e
n
ameLimit
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
E
lijah
N
ewren
progre
s
s: fix prog
r
ess meters when dealing
w
ith
lots
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
Elija
h
Newre
n
merge
-
recursive: handle
a
d
ditio
n
of submod
u
le on
our
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-14
Eli
j
ah Newren
s
e
q
uencer:
w
arn when internal merge may be subopt
i
mal
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah
N
ewren
t
6
044: new merge testca
s
e
s
for whe
n
index doe
s
n't ma
t
ch
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
E
lijah Newren
m
e
rge-
o
cto
p
us:
a
bort if index does n
o
t
m
a
tc
h
HEAD
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah
N
ewren
bu
i
ltin/merge
.
c: f
i
x a
b
u
g
with trivial merges
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
El
i
j
a
h Newr
e
n
t7605: add
a testcase demonstrating a bug with trivial
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
E
l
i
jah
N
ewren
m
e
rge-recursive: do not check
working copy
when creating
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah Ne
w
ren
merge-
r
ecursive: re
m
ove dup
l
i
c
ate code
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merg
e
-re
c
ursive: 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
-
r
e
cursive: Fix virt
u
al merge base for
r
ename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah
Newr
e
n
t60
3
6:
criss
-
cross +
rena
m
e/rena
m
e(1to2)/add-d
e
s
t
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
m
erge-recursive: Avoid
u
nnece
s
sa
r
y file rewrites
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6022: A
d
d
i
tional tests checking
for unneces
s
ary upda
t
es
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah Newren
merge-re
c
ursiv
e
: Fix spurious 're
f
using to
l
ose untracked
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah Newren
t6
0
2
2: Add t
e
stcase
f
o
r spurious "refusing to lose
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah Newre
n
merge-r
e
cursi
v
e:
F
i
x working copy handling for rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next