repo.or.cz
/
git
/
dkf.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'js/checkout-untracked-symlink' into next
2011-02-03
Elijah Newr
e
n
Add testca
s
e
s sho
w
ing how pa
t
hspecs
a
re han
d
l
ed w
i
th
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-02-03
Elijah Newre
n
Make re
v
-list --obj
e
cts
w
ork together with pathspecs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newren
Introd
u
ce sane_
u
n
set and us
e
it
t
o ensur
e
pr
o
per &
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
E
l
ijah Ne
w
r
e
n
t7800 (
d
i
f
ftool): add mi
s
sing &&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah N
e
wren
t
7
6
01 (merge-pull-config): add missing &&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah
N
e
w
ren
t70
0
1 (m
v
): add missing &&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah
Ne
w
re
n
t6016 (rev-list-graph
-
si
m
plif
y
-history): add missing &&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newren
t5602 (
c
lon
e
-remo
t
e-exec):
add miss
i
ng &
&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
E
lija
h
Newren
t4026 (co
l
o
r
):
r
em
o
ve unne
e
ded a
n
d unchain
e
d command
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elija
h
Newren
t4019 (diff-wserr
o
r
)
: add lots of missing
&&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
E
lij
a
h Newren
t4202 (l
o
g): R
e
place '<git-command> || :' with test_
m
ight_
f
ail
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
El
i
jah Newre
n
t400
2
(d
i
ff-basic):
u
se tes
t
_
might_
f
a
i
l for comma
n
ds
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah
N
ewren
t100[12
]
(rea
d
-tree-m-2way, read
_
tr
e
e
_
m
_u_2way): add
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newren
t4017 (diff-retva
l
): repla
c
e
manual
e
xit code check
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-04
Elija
h
New
r
en
t3020 (ls-files-e
r
ror-
u
nmatch): remove s
t
ray
'
1' from
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
El
i
jah New
r
en
merge-r
e
cursive: Remove re
d
unda
n
t
p
ath
c
learing for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah N
e
wren
merge-rec
u
rsive: Make r
o
om for directories in D/F conflicts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
handle_delete_modify(): Check whether D/F
c
onflicts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
l
ijah
N
ewren
mer
g
e_content(): Check whether
D/F
conflicts are still
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
lija
h
Ne
w
ren
conflict_rename_rename_1to2(): Fix checks f
o
r presence
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah N
e
wren
conflict_ren
a
me_delete():
C
heck whe
t
her D
/
F
conflicts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah
Newren
m
e
rge-recursi
v
e: Delay mod
i
f
y/delete
conflicts if D
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah
Newre
n
merge-
r
ecursive
:
D
e
lay content m
e
rgi
n
g
fo
r
renam
e
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
merge-recur
s
i
v
e: Delay
handling o
f
renam
e
/delete
conflicts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
merge-recursive: Move h
a
ndling of double re
n
a
m
e of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
me
r
ge-recursi
v
e
:
Move
h
andling of double rename of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
merge
-
r
e
cursive: Avoid
d
oubly
m
erging rename/ad
d
co
n
f
lict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elij
a
h Newren
merg
e
-r
e
curs
i
ve: Updat
e
merge_
c
o
n
tent() ca
l
l s
i
gnature
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elij
a
h New
r
en
merge
-
recursive: Upd
a
te c
o
n
f
lict_
r
ename_rena
m
e_1to2
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
l
ijah Newren
merge-re
c
ursi
v
e: Structu
r
e
process_df_e
n
tr
y
() to handle
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah
N
ewren
mer
g
e
-
re
c
urs
i
ve: Have proc
e
ss_e
n
t
ry() skip D/
F
o
r rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elij
a
h
Newre
n
m
e
rge-recursi
v
e
:
New functio
n
to assist resolving r
e
names
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Eli
j
ah Newren
merg
e
-recursive
:
New data
s
tr
u
c
tures for deferrin
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
merge-recurs
i
ve: Move
process_entry's co
n
ten
t
merging
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
l
i
jah
N
e
w
ren
mer
g
e-re
c
ursive: Move del
e
te/mo
d
if
y
handling int
o
dedica
t
e
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newre
n
merge-recursive: Move
r
e
name
/
delet
e
handling into dedic
a
ted
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Eli
j
ah Newren
merge-recursive: Nuke rename/directory c
o
nf
l
i
c
t
d
ete
c
tion
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
El
i
j
a
h Newren
mer
g
e-recursive: Rename conflict_rename
_
rename*() for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah N
e
wr
e
n
merge-re
c
ursive: Small cod
e
clarification -- varia
b
le
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
t60
3
6: Ad
d
t
e
s
t
case for undetected
c
o
nfli
c
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newre
n
t6036: Add a seco
n
d
t
estcase sim
i
l
a
r to the fir
s
t but
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elij
a
h
Newren
t6036: T
e
st
i
ndex
a
nd
w
orktree s
t
ate, not just that
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
lijah Newren
t
6020:
A
dd a test
c
ase
f
o
r
modify/delete + directo
r
y
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
l
i
j
ah Newren
t6020: Modernize style a bit
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
t6022
:
Add t
e
sts for
r
enam
e
/rena
m
e
combined with D
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah N
e
w
ren
t6022: Add paired rename+D/F conflict: (
t
wo/
f
i
l
e, one
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
t6022
:
Add t
e
sts with both rename sourc
e
&
d
est invol
v
e
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
t
6022: Add tests for
reversing or
d
er of merge
s
w
h
en
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
t6022:
Add test
c
ombina
t
i
ons of {c
o
nten
t
c
onfl
i
ct?
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elija
h
Newre
n
t6032: Add a test
check
i
ng for excessive
o
utput from
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-10
Elij
a
h Newren
merge-rec
u
rsive: D/F c
o
nflicts where wa
s
_a_d
i
r/file
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-10
Eli
j
ah Newren
t3509: Add re
n
am
e
+ D/F co
n
flict testcase
t
h
a
t recursive
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-07
Elij
a
h Newre
n
revert: Fix trivial
c
omment style issue
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-07
E
l
ijah Newr
e
n
cache
_
tree_free: Fix small memory
l
eak
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-26
Elijah Newr
e
n
diff
_
tree(): Skip skip_uninteresting() when all remaining
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-26
Elijah Newren
tree
_
entry_inte
r
esting(
)
: Make return
v
al
u
e more s
p
ecific
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-26
Elijah Newren
t
r
e
e
-
walk: Correct bit
r
otted comment about tree
_
entry()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-26
Elij
a
h
N
ewren
D
o
cumen
t
p
re-conditi
o
n for tree_entry
_
interesting
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-25
E
lijah Newren
tree-walk: C
o
rre
c
t
b
itrotted com
m
ent ab
o
ut
t
r
ee
_
entry()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-20
Elij
a
h Ne
w
re
n
merge
-
recu
r
sive: Avoid ex
c
essi
v
e output for
and r
e
pr
o
cessing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Elijah Ne
w
ren
m
e
r
g
e-r
e
cursi
v
e
:
Fix mu
l
tiple file rename acros
s
D
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Elijah Ne
w
ren
t6031: Add a testcase covering mult
i
ple rena
m
e
s
a
cr
o
ss
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
El
i
jah
Newren
merge-recursive: F
i
x t
y
po
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-13
El
i
j
a
h N
e
w
ren
M
ark test
s
tha
t
u
se symli
n
ks
a
s
n
e
eding SYMLINKS pr
e
req
u
isite
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-13
Elijah
Newren
pu
l
l --rebase
:
Avo
i
d
s
purious confl
i
cts
a
nd
r
eapp
l
ying
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-13
Elijah Newre
n
t
5
520-pull:
Add testca
s
es showing spuri
o
us conflicts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-02
El
i
jah Newre
n
upload-pack
:
Improve error message whe
n
b
ad
ref request
e
d
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
Elijah Newre
n
fast-e
x
po
r
t: Add a --full-tree option
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
Elijah
Newren
fast-e
x
port: Fix dro
p
ping
o
f
files with --import-marks
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-09
Elijah Newren
f
a
st-impo
r
t: Im
p
rove
r
obustnes
s
when
D
->F change
s
provided
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-09
Elij
a
h Newren
f
ast-export: Fix
output order of D/F c
h
a
nges
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-09
Elija
h
Newren
merge
_
recur
s
i
ve: F
i
x
r
enames across pat
h
s below D/F
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-09
El
i
jah Newren
merge-re
c
ursive: Fix
D
/F confli
c
ts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-09
Elijah Newren
Add additional testc
a
se
s
for
D
/F con
f
lict
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-06-27
Elijah
New
r
e
n
fast-expor
t
: Docu
m
e
n
t the
fact that
g
i
t-r
e
v-list arguments
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-06-27
Elijah Newren
Add new fast-export testcase
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-06-27
El
i
jah N
e
wren
fast-e
x
port: A
d
d a --tag-of-filte
r
e
d-object opti
o
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-06-27
Elijah Ne
w
ren
fast-export: Do parent rewrit
i
ng
to
a
void droppin
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-06-27
Eli
j
ah Newr
e
n
fast-export:
Make s
u
re we show actual ref
n
ames inst
e
ad
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-06-27
Elijah Newren
fast-export:
O
mit tags that tag trees
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-06-27
Elijah Newren
f
ast-ex
p
o
r
t: Set
r
evs
.
top
o
_ord
e
r before ca
l
ling setup_revisions
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-05-16
Elijah New
r
e
n
git
k
:
Make more
options easily accessible f
r
om E
d
it
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-03-26
Elijah Newr
e
n
fast-export: Avo
i
d dropping fil
e
s
from commit
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-03-25
Elijah Newren
Correct m
i
ssing S
P
char
a
ct
e
rs in grammar comment at
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-03-25
Elijah Newren
gi
t
-
f
ilter-branc
h
: avoid collisions with vari
a
bles
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-02-28
E
lijah
Ne
w
ren
Ensure proper
s
etup of git_d
i
r f
o
r git
-
hash-object
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-02-12
E
l
i
jah Newren
fast-expor
t
: ensure we tra
v
erse commits in
topological
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree