repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
t6042: Add a pair of cases where undetected renames cause issues
2011-08-14
E
l
ijah Newren
t6042:
A
dd a
pair of
cases
where
u
ndetected ren
a
mes
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah N
e
wren
t6042: Add failin
g
testcase for
rename/modify/add-source
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
j
a
h Newr
e
n
t6
0
42: A
d
d
a
te
s
tcase
w
here git
del
e
t
es an unt
r
acked
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-02-03
Elijah Newren
Add testcases
sho
w
i
n
g
h
ow pathspec
s
ar
e
h
a
ndled with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-02-03
E
lijah Newren
M
a
k
e rev-list
-
-objects work togeth
e
r
with
p
athspecs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newr
e
n
Introduce sane_uns
e
t
and use it to ens
u
re proper &
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah
N
e
wre
n
t780
0
(di
f
ftool): add
m
i
ssing &&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
E
l
i
j
a
h Newren
t7601 (
m
erge-pull-config): add
missing &&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah
N
ewre
n
t7001 (mv): add missin
g
&&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elija
h
Ne
w
ren
t601
6
(rev-list-g
r
a
ph-simplify-history): add
missing &&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah
N
ewren
t5602 (clon
e
-remote-exe
c
):
a
dd missing
&&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newren
t4026 (color): remove unneeded and unchained command
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah N
e
wren
t4019 (diff-wserror): add
l
o
ts
of m
i
ssing
&
&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Ne
w
r
en
t4
2
02 (log
)
:
Rep
l
ace
'
<
g
i
t-command>
||
:
' with test_mig
h
t_fail
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Eli
j
ah N
e
wren
t4002 (diff-bas
i
c): use test_mi
g
h
t
_
fail for commands
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah N
e
wren
t
1
00[12] (rea
d
-tree-m-2way, r
e
a
d_tree_m_u_
2
way): add
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah
N
ewren
t4017 (diff-retval): replace man
u
al exit co
d
e
c
hec
k
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-04
Eli
j
ah Newren
t
3020 (ls-files-error
-
unmatch): remove stra
y
'
1' from
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
lijah New
r
en
m
e
rge-rec
u
rsive
:
R
emove redundant path clearing for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
me
r
ge-recursive:
Make room
for direct
o
rie
s
i
n D/F confl
i
cts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Ne
w
r
en
hand
l
e_d
e
lete_modify
(
):
Check wh
e
ther D/F c
o
n
f
lic
t
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah
New
r
en
merge_content(): Chec
k
whether D/F confl
i
cts
a
re sti
l
l
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
conflict_r
e
name_rename_1to2():
F
ix checks for p
r
esence
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
lijah
N
ew
r
e
n
c
o
n
flict_rename_delete()
:
Check w
h
e
ther D/F conflicts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
El
i
j
ah Ne
w
ren
mer
g
e-recu
r
sive: Del
a
y mod
i
fy/de
l
ete
confli
c
ts if
D
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Ne
w
ren
merge
-
rec
u
rsive
:
D
elay content merging fo
r
ren
a
mes
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah N
e
w
r
en
merge
-
r
ecursive: D
e
l
a
y handling of re
n
a
me/d
e
lete confl
i
cts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
l
ijah Ne
w
ren
merge-recursive: Move handli
n
g
o
f double
renam
e
of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newr
e
n
merge-recursive:
Move handlin
g
o
f double
r
ename of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Ne
w
ren
me
r
ge-recurs
i
ve: A
v
oid doubly merg
i
ng
rena
m
e/ad
d
conflict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
merge-recursive: Update
m
erge_content(
)
call
s
ignature
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
m
erg
e
-recursive: U
p
d
a
t
e
c
o
n
flict_rename_rename_1
t
o
2
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newr
e
n
me
r
g
e-recursive: S
t
ructure proce
s
s_df_e
n
try() t
o
hand
l
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Eli
j
a
h
Newren
merge-
r
ec
u
rsive: Ha
v
e process_entry() skip D/F or
r
ename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elija
h
Newre
n
m
e
rge-recursi
v
e: New functi
o
n to assist
res
o
lving renames
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
El
i
jah N
e
wren
m
erge-rec
u
rsi
v
e: New data s
t
ructure
s
f
or deferri
n
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Eli
j
ah New
r
en
merge-recu
r
s
i
ve: Mo
v
e process_entry's
c
o
n
t
ent me
r
gin
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
El
i
ja
h
N
ewren
merge-recursive:
M
ove delete/
m
odify handlin
g
i
n
to dedicated
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah
N
e
w
r
en
merge-r
e
curs
i
v
e: Move rename/del
e
te h
a
ndling into d
e
dicated
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
merge-recursive: Nuke rename/
d
irectory
c
onfl
i
ct
d
e
t
e
c
t
ion
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
merge-recu
r
s
ive:
Ren
a
me con
f
l
i
ct_re
n
ame_re
n
a
m
e*()
for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newr
e
n
merge-recur
s
ive: Sm
a
ll
c
od
e
cl
a
r
i
ficatio
n
-- var
i
a
b
le
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah
Ne
w
r
e
n
t6
0
36: Add t
e
stcase for undet
e
cted con
f
lict
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Eli
j
a
h Newren
t6036:
Add
a
second test
c
a
se si
m
ilar to the first b
u
t
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elij
a
h
N
e
wren
t6036: Test index and w
o
rktree state
,
no
t
j
u
s
t that
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
t6020: Add a testca
s
e for
modify/delete
+ directory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
t6020: Modern
i
ze style
a
bit
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Eli
j
ah
N
ewren
t6022: Add tests for rename/rename combined with D
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
t6022: Add pa
i
red rename+
D
/F con
f
lict: (two/
f
ile, one
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
t602
2
:
Add t
e
sts with
both renam
e
s
ource & dest involved
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
El
i
jah Newren
t6022: Ad
d
tests
f
or reversing order
o
f me
r
g
es when
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
t6022: Add
t
est com
b
inat
i
ons of {con
t
e
nt
c
onfl
i
ct?
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah
Newren
t6
0
32:
Ad
d
a test che
c
king for
excessi
v
e
o
utput from
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-10
Elij
a
h New
r
en
merge-recursi
v
e: D/F conflicts wher
e
w
as_a_d
i
r
/
file
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-10
Elijah Newren
t3
5
09: Add rename + D/F
c
onfli
c
t testcase that recur
s
ive
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-07
Eli
j
ah Newren
r
e
vert: Fi
x
trivial com
m
e
nt style iss
u
e
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-07
E
l
ijah Newren
cache_tree_free: Fix small memory
l
ea
k
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-26
Elijah Newren
dif
f
_tree()
:
S
kip skip_unint
e
resting
(
) when all re
m
aini
n
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-26
E
lijah Newren
t
ree_entry_interesting(): Make
return value more spe
c
ific
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-26
Elij
a
h Ne
w
ren
tree-walk: Correct
b
i
trot
t
e
d
comment about tree_entry()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-26
Elijah Newren
Document
pre-condit
i
on for t
r
e
e
_en
t
r
y
_interesting
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-25
E
lija
h
N
ew
r
e
n
tr
e
e-w
a
lk:
C
orre
c
t bitrot
t
ed comm
e
nt about tree_en
t
ry()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-20
El
i
j
ah
Newr
e
n
merge-recursive: Avoid excessive o
u
tput for
a
nd rep
r
oce
s
sing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
E
lija
h
Newren
merge-re
c
ursive
:
Fix multiple file r
e
name ac
r
oss D
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Elijah Newren
t6031:
Add a testcase covering
multiple
renames across
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Elijah Ne
w
ren
merge-recu
r
s
i
ve: Fix typo
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-13
Elijah Newren
Mark te
s
ts that use
symlinks as n
e
eding S
Y
M
LINKS prerequisite
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-13
E
lijah Newr
e
n
pull --reba
s
e: Avoid spurious confl
i
c
t
s and reapplyi
n
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-13
Elij
a
h N
e
wren
t55
2
0-pull:
Add test
c
ases showi
n
g spurious conflicts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-02
E
l
i
jah N
e
wren
upload
-
pack:
Improve error message when
bad ref req
u
ested
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
Elijah Newren
f
ast-export: Add
a --f
u
ll-tree op
t
io
n
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
E
lijah Newren
fas
t
-
export:
F
i
x
dropp
i
ng of files
w
i
th --i
m
port-marks
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-09
Elijah Newren
fast-
i
mport: I
m
prove robustnes
s
when
D
-
>F changes p
r
ovided
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-09
Elijah Newren
f
ast-export: F
i
x output order of D/F changes
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-09
Elijah
Newren
merg
e
_recursi
v
e
:
F
ix rena
m
es a
c
ros
s
path
s
b
e
l
o
w D/F
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-09
El
i
j
ah
N
e
w
ren
merge-re
c
ursive: Fi
x
D
/
F conflicts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-09
Elijah Newre
n
A
dd additional test
c
ases for D/F conflicts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-06-27
El
i
j
a
h Newren
f
ast-
e
xport: Docum
e
nt
t
he
f
act that git-rev-
l
ist argu
m
ents
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-06-27
Elijah Newren
Add new f
a
st-ex
p
ort test
c
a
s
es
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-06-27
El
i
j
a
h Ne
w
ren
fast
-
export: Ad
d
a --
t
ag-of-filtered-
o
bject option
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-06-27
Elij
a
h Newren
f
as
t
-export: Do parent re
w
riting to avoi
d
d
r
opping
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-06-27
Elija
h
Ne
w
ren
fast
-
export:
Make sure
we
sho
w
actual ref nam
e
s instea
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-06-27
Eli
j
ah
N
ewren
f
a
st-ex
p
ort: Omit
tags th
a
t
tag tr
e
es
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-06-27
Elija
h
Newren
fa
s
t-export: Set r
e
vs
.
top
o
_order before
calli
n
g
setup_revisions
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-05-16
Elijah
N
ewren
git
k
: Make more option
s
easily acc
e
ssible from Edit
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-03-26
Elijah Newren
f
ast-ex
p
ort:
Avoid
d
ropping files from commits
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-03-25
Elijah Newren
Correc
t
missing SP characters in
grammar comment at
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-03-25
E
l
ijah Newren
git-filter-br
a
nch: avoid collisions with variables
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-02-28
Elij
a
h
N
ewren
Ens
u
re pro
p
er s
e
tup of git_dir for git-h
a
s
h-obj
e
ct
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-02-12
Elijah Newren
f
ast-e
x
port: ensure we traver
s
e
co
m
mits in topolo
g
ical
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree