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
fetch tests: re-arrange arguments for future readability
2010-09-30
Elijah Newren
merge-recur
s
ive: Avoid doubly merging r
e
name/
a
dd
c
on
f
lict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Ne
w
ren
merge-recursive:
Updat
e
merge_co
n
tent
(
) call signature
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
El
i
jah Newren
merge-recur
s
iv
e
: Update conflict_re
n
ame_rename_1to
2
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Eli
j
ah
Newren
me
r
ge-
r
ecursive: Stru
c
tur
e
process_df_entry() to handle
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
El
i
jah Newren
m
erge
-
r
e
cursive: Have process_entry() skip D/F
o
r
rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Eli
j
ah New
r
en
merge-recur
s
ive: New function to assist res
o
lving renames
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
lijah
Newren
merge-rec
u
rsive:
New
data struc
t
ure
s
for defer
r
ing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah New
r
en
merge-rec
u
rsive: Move proc
e
ss_en
t
ry's content merging
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
l
ijah New
r
en
merg
e
-recurs
i
v
e
: Move delet
e
/mod
i
fy handling
i
n
to
d
edicated
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Eli
j
a
h
Newr
e
n
m
erge-recursiv
e
:
Move rename/d
e
lete han
d
ling in
t
o dedi
c
ated
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah
Ne
w
re
n
merge-recursive:
N
u
ke rena
m
e/directory
c
on
f
l
i
ct detect
i
on
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
El
i
jah Ne
w
re
n
merge-recursive: Re
n
ame conflict_rename
_
rename*() f
o
r
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
merg
e
-recursive: Small cod
e
clarification -- variabl
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
El
i
jah Newren
t6036:
Add testcase for undetect
e
d conflict
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
l
ijah Newren
t6036: Add a second testcas
e
similar to the first but
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
l
i
jah N
e
w
r
e
n
t
6036:
T
e
st index
and
worktree state, not ju
s
t
t
h
at
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
t
60
2
0: Add a testca
s
e for modify/del
e
te + directory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
t6020:
M
odernize
s
tyle a
b
it
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Eli
j
a
h
Newren
t6022
:
A
d
d tests for rename/r
e
name
c
ombined
with D
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
t6022: Add
p
aired rename+D/F
c
o
n
fl
i
ct: (two
/
file,
one
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
t6022: Add tests wi
t
h both rename source & dest i
n
volved
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
t
6
022: Add tes
t
s
f
or reve
r
s
ing order of me
r
ges when
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah N
e
wren
t6022: A
d
d test combinations of {content co
n
flict?
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
t6032:
A
dd a test checking
f
or ex
c
essive
o
u
tput
from
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-10
Elijah Newr
e
n
m
erge-recursive
:
D/F conflicts wh
e
re was_a
_
dir
/
file
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-10
Elijah
N
ewren
t3509
:
Add re
n
ame + D/F co
n
flict testcas
e
that recursive
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-07
Elijah Newren
revert: Fix trivial
c
omment style issue
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-07
E
l
ijah Newren
cache
_
tree_fre
e
: F
i
x small m
e
mory leak
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-26
Eli
j
ah Newr
e
n
diff_tree(): Skip
s
kip_unin
t
e
resting() when all remaini
n
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-26
Elijah Newren
tree_
e
n
try_inter
e
st
i
ng(
)
:
M
ake return
v
alue mor
e
specific
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-26
E
l
ijah Ne
w
ren
t
ree-walk
:
Correct b
i
trot
t
ed
comm
e
nt about tree_
e
n
tr
y
()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-26
Elijah N
e
w
r
en
Docume
n
t
pre-co
n
dition
f
or tree_entry_interesting
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-25
Elijah Newren
tree-walk: Correc
t
bitr
o
tted comment about tree_e
n
try()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-20
Elijah Newren
m
er
g
e-r
e
cursive: Avoid
e
xcessive output fo
r
and repr
o
cessing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Elijah
N
ewren
m
erge-r
e
c
ursiv
e
: Fix multip
l
e
f
il
e
rename across D
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Elijah Newre
n
t6031
:
A
d
d
a
testc
a
se covering mult
i
p
le renames across
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
E
lijah Newren
merge
-
recursive:
Fix typo
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-13
Elij
a
h Newr
e
n
Mar
k
tests tha
t
use syml
i
nks
as needing SYMLINKS p
r
erequisite
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-13
Elijah Newren
pull --rebase
:
Avoid sp
u
rious
c
o
n
flicts
a
nd reappl
y
ing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-13
Elijah Ne
w
r
e
n
t
5
520-p
u
l
l
: Add testcases
showing spurious co
n
fl
i
cts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-02
Elijah Newren
uploa
d
-pack: Improve error
message when bad r
e
f reque
s
ted
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
Eli
j
ah
Newren
fast-export
:
Add
a
-
-
full
-
tree o
p
tion
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
Eli
j
ah Newren
fa
s
t-export:
F
ix
droppin
g
of files with
--im
p
o
rt-marks
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-09
Elijah
Newren
fast-im
p
o
r
t: Improve robustness
when D->F changes
provid
e
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-09
Elijah Newren
fast-export: F
i
x outp
u
t order
o
f D/F changes
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-09
Elij
a
h Newren
mer
g
e_recursive: Fix renames across paths below D/F
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-09
Elij
a
h N
e
wr
e
n
merge-
r
ecursi
v
e: Fix D/F
conflicts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-09
E
l
ijah Newren
A
d
d
a
dditio
n
al
t
es
t
cases for D/F conflic
t
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-06-27
Elijah Newren
fast-exp
o
r
t
: Document
t
h
e
fact that g
i
t
-rev-l
i
s
t a
r
gumen
t
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-06-27
Eli
j
a
h N
e
wr
e
n
Add new fa
s
t-expo
r
t testcases
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-06-27
Elijah Newre
n
fast-expo
r
t: A
d
d a --tag-of-filtered
-
object option
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-06-27
Elijah Newren
fas
t
-export: Do pa
r
en
t
rewrit
i
ng to av
o
id dropp
i
ng
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-06-27
E
l
i
jah Newr
e
n
fast-export: Make sure
w
e
show actual ref name
s
instead
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-06-27
Elijah Newren
fast-expo
r
t:
Omi
t
tags
t
ha
t
tag trees
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-06-27
Elijah Newren
f
a
s
t
-
e
xport: Set re
v
s
.
topo_order
before c
a
lling set
u
p_r
e
visio
n
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-05-16
E
l
i
jah N
e
wren
git
k
:
Make more options eas
i
ly
accessible from Edit
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-03-26
Elijah Newre
n
fast-export:
Avoid droppi
n
g
fil
e
s from commits
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-03-25
Elijah New
r
e
n
Correct mis
s
ing SP
characters in
grammar comme
n
t
at
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-03-25
E
lijah Newren
git
-
filter
-
br
a
nch: avoid
c
ol
l
isions w
i
th variable
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-02-28
E
l
i
j
ah Newren
Ensure proper s
e
t
u
p
of git_dir
f
or
g
it-ha
s
h-o
b
j
e
c
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-02-12
E
l
i
jah Newren
fas
t
-
e
xport:
ensure we traverse commits in t
o
po
l
ogical
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree