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
Merge branch 'jd/fix-strbuf-add-urlencode-bytes'
2010-09-30
Elijah Newren
m
e
rg
e
-recursive: Avoid dou
b
ly me
r
ging rename/add conflict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newre
n
merg
e
-recursive:
U
pda
t
e
merge_content() call signatu
r
e
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah New
r
en
merge
-
recursive: Update confli
c
t_
r
ename_rename_1t
o
2
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
El
i
jah Newr
e
n
merge-recurs
i
ve: Structure process_df_entry() to
h
and
l
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah
N
ew
r
en
m
e
rg
e
-
recursive:
H
ave pro
c
es
s
_entry() skip
D
/F or
rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah
Newr
e
n
mer
g
e
-
recu
r
sive:
N
e
w
function to assist resolving renames
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
mer
g
e-
r
ec
u
rsi
v
e: New
data structures fo
r
d
eferri
n
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
l
i
j
ah Newren
m
e
rg
e
-
r
e
cursive
:
Move process_entry's c
o
nten
t
merging
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
merge-recurs
i
ve:
Mo
v
e d
e
le
t
e/modi
f
y handling into dedicated
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah
N
e
wren
merge-recursiv
e
: Mo
v
e
rena
m
e/delete handling into dedi
c
ated
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newr
e
n
m
e
rge-re
c
ursive:
N
uke rename/dire
c
t
ory conflict de
t
e
c
tion
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
lijah
N
e
w
ren
m
erge-recursive:
Rename c
o
nf
l
ict
_
rename_re
n
ame
*
() for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Eli
j
ah Newren
me
r
ge-re
c
u
rsive: Small c
o
de clarifi
c
ation -- variable
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elij
a
h New
r
en
t6036: Add testca
s
e for undetecte
d
c
o
n
f
lict
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elij
a
h Newren
t6036: Add a
seco
n
d
t
est
c
a
se similar to
t
he first but
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
l
ijah Newren
t6036:
T
est index and w
o
rktree st
a
t
e, not
j
ust
t
h
a
t
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah
N
e
w
ren
t6020
:
A
dd
a
tes
t
case for modify/delete +
directo
r
y
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Eli
j
a
h
Newren
t6020
:
Modernize st
y
le a bit
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elij
a
h
New
r
en
t6022:
A
dd
t
e
s
ts for
r
ename/renam
e
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 conflict: (tw
o
/f
i
le
,
one
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
lija
h
N
e
wren
t6022: A
d
d te
s
ts
wit
h
both rename source & dest i
n
vol
v
ed
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
lijah Newr
e
n
t60
2
2: Add tes
t
s for rever
s
i
n
g order of
m
erges when
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Eli
j
ah Newren
t6
0
2
2
: Add test combinations of {cont
e
nt conflic
t
?
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
lijah New
r
en
t6032: A
d
d a test chec
k
ing for excessive ou
t
put from
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-10
E
l
ijah Ne
w
ren
merge-re
c
u
rsive: D/F conflic
t
s where was_a_dir/file
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-10
Elijah Newren
t3509:
Add
renam
e
+ D/F conflict testcase that recursi
v
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-07
Elijah Newren
rever
t
: Fix tr
i
vial comment style issue
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-07
El
i
j
a
h Newren
cache
_
t
r
ee_free: Fix
sm
a
l
l memor
y
l
e
ak
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-26
Elijah Newren
diff_tree():
S
ki
p
skip_uninter
e
sting()
when
a
ll remaining
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-26
Eli
j
a
h
N
e
wren
tree_entry_interes
t
ing(): Make return va
l
u
e more specific
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-26
E
l
ijah Newre
n
tree-wa
l
k: Corre
c
t bitrot
t
ed
c
o
m
m
en
t
about tree_entr
y
()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-26
Elijah Ne
w
r
e
n
Do
c
ument pr
e
-conditi
o
n for tree_en
t
ry_int
e
res
t
i
ng
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-25
Elijah N
e
wren
tree-walk:
Correct b
i
trotted co
m
me
n
t
a
bo
u
t tree_entry()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-20
Elijah Newren
merge-recur
s
ive: Avoid excessive output for and reproc
e
ssing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Elijah N
e
w
r
en
merge-
r
e
cu
r
sive
:
Fix multiple file rename across D
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Elijah Newren
t6031: Add a tes
t
case co
v
e
r
ing multiple
r
enames acr
o
s
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Elijah Newre
n
merge-recursiv
e
: Fix typo
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-13
E
lij
a
h Newren
M
ark tests
t
h
at u
s
e sy
m
lin
k
s
as n
e
eding SYML
I
NKS prerequisite
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-13
Elijah Newr
e
n
pul
l
--
r
ebase: Avoid spurious con
f
l
i
cts
a
nd re
a
pplying
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-13
E
l
ijah Newren
t55
2
0-pull: Add t
e
stcases showing spurious conflict
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-02
Elijah Newren
upload-p
a
ck:
Impro
v
e
error message w
h
en
bad ref
r
equested
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
Elijah Newren
fast-export: Add a --full
-
tree option
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
Elijah Newren
fast-export: Fix droppi
n
g of fil
e
s with
--import-
m
arks
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-09
Eli
j
a
h Newren
fast-im
p
ort
:
Improve robustnes
s
when D->F changes pro
v
id
e
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-09
Elijah N
e
wre
n
f
ast-export: Fix o
u
tput order of
D/F cha
n
ges
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-09
Elijah
N
e
wren
merge_recursive
:
Fix renames acr
o
ss paths below D/F
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-09
E
l
ijah New
r
en
me
r
ge-recursive: Fix D/F co
n
fl
i
cts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-09
Elijah Newren
Add ad
d
itiona
l
testcases for
D
/F conflicts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-06-27
Elijah Ne
w
r
e
n
fast-e
x
p
ort:
D
o
c
ument the
f
act that git-r
e
v-
l
ist argument
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-06-27
Elijah Newren
Add new fast-exp
o
rt testcases
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-06-27
Elijah Ne
w
re
n
fast-export:
Add a --tag-of
-
f
i
ltere
d
-object option
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-06-27
E
l
ij
a
h Newren
fast-export: Do par
e
nt re
w
r
i
t
i
ng to avoid droppi
n
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-06-27
El
i
jah N
e
wren
fast-export: Make s
u
r
e we show actu
a
l ref n
a
mes instea
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-06-27
E
l
ijah Newren
fast-expo
r
t:
O
mit tags that tag tree
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-06-27
Elij
a
h
Ne
w
ren
f
as
t
-exp
o
rt: Set r
e
vs
.
topo_orde
r
b
e
fore calling setup_re
v
i
s
ions
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-05-16
Elij
a
h Newre
n
gitk: Make
more
options
easily accessi
b
le from Edi
t
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-03-26
Elija
h
Newren
f
a
s
t-export:
A
void dropping files from com
m
its
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-03-25
Elijah Newren
Correct missing SP c
h
aract
e
r
s
i
n
gra
m
mar comm
e
nt at
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-03-25
Elijah Newren
g
i
t-f
i
lter-branch: avoi
d
c
ollisions with variables
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-02-28
E
li
j
ah
N
e
wren
Ensur
e
proper
setup
of git_dir
for
g
it-hash-
o
b
ject
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-02-12
Elijah Newren
fast-export: ensure
w
e traver
s
e comm
i
ts in topol
o
g
ical
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree