repo.or.cz
/
git
/
jrn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
merge-recursive: Fix code checking for D/F conflicts still being present
2011-08-14
Elijah Newr
e
n
merge-recur
s
ive: Fix code
c
hecking for D/F conflicts
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recursi
v
e: Fix sorting or
d
er
a
n
d
d
i
r
ectory change
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-14
E
l
i
jah
N
ewren
merge-recursive
:
Fix r
e
cursive case w
i
th D/F con
f
lic
t
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah Newren
merg
e
-recursive:
A
void workin
g
d
irectory changes during
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
a
h Newren
merge-recursiv
e
: Remember to free generate
d
unique
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah Newren
merge-recursive: Consolidate different update_stages
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h
Newren
merge-recursi
v
e:
M
a
rk some diff_fil
e
spec struc
t
arguments
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah N
e
w
ren
m
e
rge-recursive
:
Cor
r
ect a
comment
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recursi
v
e
: Make
B
UG messa
g
e more legibl
e
b
y adding
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah New
r
en
t6022: Add testcase for merging a renamed fi
l
e wit
h
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
a
h N
e
wren
t602
2
: New tests checking
for u
n
necessar
y
u
pdate
s
of
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6022
:
R
emo
v
e unnecessary
u
ntracked files t
o
make test
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6036
:
c
r
iss-cross +
rename/rename(1to2)/add-sour
c
e
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newre
n
t6
0
36:
c
r
i
s
s
-cross w/ rename/
r
ena
m
e
(1to
2
)
/modify+ren
a
m
e
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t60
3
6: tests for criss-cross
m
erges with
vario
u
s directory
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah Newren
t6036: criss-cross with weird
c
ontent can foo
l
g
i
t
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t603
6
: Add diffe
r
ent
l
y resolved modify/
d
elete conf
l
ict
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
ew
r
en
t6042:
A
d
d failing tes
t
cases for
rename/rename/
a
dd
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah
Newren
t6042: Ens
u
re rename/
r
ename conflict
s
leave
i
ndex
a
nd
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h Newr
e
n
t
6042: A
d
d tests
for c
o
ntent issues with m
o
di
f
y/rename
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t
6
042:
A
d
d a t
e
s
t
cas
e
w
here undetected rename causes
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
ewren
t
60
4
2: Add a pair of cas
e
s
where un
d
et
e
cted renames
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6042: Add
f
ail
i
ng
t
es
t
case for rename/modify/ad
d
-
s
ource
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h
N
e
wren
t6042: Add a
t
estcase where git
d
elete
s
an untra
c
ked
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-03
El
i
jah Newren
A
dd testcases showing
h
o
w
pathspecs
are handled
w
ith
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-03
Elij
a
h Newren
Ma
k
e rev-
l
i
s
t --
o
bjects work together with
p
athspec
s
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Ne
w
ren
Introduce san
e
_unse
t
a
nd use
i
t to e
n
s
ure p
r
oper &
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-10-06
Elij
a
h New
r
en
t7800 (diff
t
ool):
a
d
d
missing &&
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-10-06
Elija
h
Newren
t76
0
1 (merge-pull-config): add missing &&
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newren
t7001 (mv): add
m
issing &&
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newren
t
6016 (rev-list-grap
h
-sim
p
lify-history): add missing
&&
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-10-06
Elijah
N
e
wren
t5602 (cl
o
ne-remote
-
exec): add missing &&
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-10-06
E
l
ijah Newren
t4026 (color): remove unneeded
and unchaine
d
comman
d
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-10-06
Eli
j
ah New
r
en
t4
0
1
9 (diff-wser
r
or): add
lots of missing &&
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-10-06
E
lijah Newren
t
4
202 (l
o
g): Replace '<git-command> || :' with t
e
s
t_might_f
a
il
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-10-06
Elij
a
h Newren
t4002 (
d
iff-basic): use
t
est_m
i
ght_fail for
c
ommands
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newren
t100[1
2
] (
r
ead-t
r
ee-
m
-2way, read_tre
e
_m
_
u
_
2way): add
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newre
n
t4017 (diff-retval): repl
a
ce ma
n
u
al exit co
d
e
chec
k
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-10-04
Elijah Newre
n
t3020 (ls-files-er
r
or-unmatch): remove stray '1' fr
o
m
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-09-30
Elij
a
h Newr
e
n
me
r
ge
-
recursive: Remove red
u
n
dant path clearing
f
or
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-09-30
E
l
ijah Newren
merge-recursive: Make
room
f
or di
r
ector
i
e
s
in D/F conflicts
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-09-30
E
l
i
jah Newre
n
han
d
le_delete_modify(
)
: Check whether D/F c
o
nflicts
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-09-30
Elijah
Newr
e
n
m
e
r
g
e_c
o
n
t
en
t
(): Check w
h
e
th
e
r D/F conflicts are still
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-09-30
Elijah New
r
en
co
n
flict_rename_rename
_
1to2(): Fix checks
for presenc
e
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-09-30
Eli
j
ah Newren
conflic
t
_rename_d
e
lete():
C
h
eck
w
h
ether D
/
F conflicts
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-09-30
Eli
j
ah N
e
w
r
en
m
e
rge-recursive: Delay modi
f
y/del
e
te con
f
licts if D
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
me
r
ge-recursive: Delay content mergin
g
for
r
e
n
ames
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-09-30
Elij
a
h Newren
merge-re
c
u
r
sive: Delay handling of
r
ena
m
e/delete co
n
f
licts
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-09-30
Elijah N
e
wren
m
e
rge-recursive: Move handling of doub
l
e rename
o
f
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-09-30
El
i
jah
New
r
en
merge-recursive: Move
h
a
ndling
o
f d
o
uble rename of
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-09-30
Elij
a
h Newren
merge-recurs
i
ve: Avoid doub
l
y mergin
g
rename
/
a
dd conflic
t
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-09-30
Elijah N
e
wren
m
erge-
r
e
c
ursive: Update me
r
ge
_
con
t
ent() ca
l
l s
i
gnature
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-09-30
E
lij
a
h Newren
merge-recursive: U
p
date co
n
flict_re
n
ame_rena
m
e_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
p
roc
e
ss_d
f
_
e
ntr
y
() to han
d
le
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-09-30
E
lijah Newren
merge-r
e
cursive: Have process_e
n
try() skip D/F or rename
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-09-30
Eli
j
ah New
r
en
merge-recursi
v
e
:
New funct
i
on to
a
ssist r
e
sol
v
in
g
renames
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-09-30
E
lijah Newren
merge-r
e
cursive: Ne
w
data
s
tructures for defer
r
ing
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-09-30
El
i
jah Ne
w
ren
m
e
rge-recursive: Move process_entry
'
s co
n
tent merging
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-09-30
Eli
j
ah Newren
merge-recu
r
sive: Move
d
e
lete/modify handling
into dedicated
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-09-30
E
l
ijah Newren
merge-re
c
ursive
:
Move
r
ename/dele
t
e handl
i
ng in
t
o dedicate
d
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-09-30
Elijah
N
ewren
merge-recursive: Nuke ren
a
me/directory conflict detection
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-09-30
El
i
ja
h
Newren
merge-recursive: Renam
e
conflict
_
rename_re
n
ame*()
for
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-09-30
Elija
h
Ne
w
ren
merge-rec
u
r
s
i
ve:
S
m
a
ll code clarific
a
tion -- variable
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-09-30
Eli
j
ah
N
e
w
r
e
n
t6036:
A
dd testcase for undete
c
ted confli
c
t
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-09-30
E
lija
h
Newren
t60
3
6:
Add a second t
e
stcase s
i
mi
l
ar to the fir
s
t
b
ut
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-09-30
E
lijah Newren
t
6
0
3
6
:
T
es
t
index and
worktree state, not j
u
st that
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-09-30
El
i
jah New
r
e
n
t6020: Add a testc
a
se for mod
i
f
y
/dele
t
e
+ d
i
rectory
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-09-30
Elijah
Ne
w
ren
t6020: Modernize style a bit
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newre
n
t
6
022:
A
dd
t
e
sts for renam
e
/
r
ename combined
with D
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-09-30
E
lijah Newren
t6022: Add
p
air
e
d rename+D/F conflic
t
: (
t
wo/file, one
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-09-30
E
lijah Newren
t602
2
: Add tests with both
rename source &
d
e
st involve
d
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-09-30
Eli
j
a
h
Newre
n
t6
0
22: Add
tests for reversing order
o
f merges when
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newre
n
t6022: Add
t
es
t
combinations of
{co
n
ten
t
co
n
f
lict?
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
t60
3
2: Add
a te
s
t checking for ex
c
essive output
from
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-09-10
Elijah
N
e
w
r
en
merg
e
-recursive
:
D/F
c
onflicts w
h
ere was_
a
_dir/
f
i
l
e
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-09-10
Elijah Newren
t3509
:
A
dd rename + D/F co
n
flict
t
estc
a
se that r
e
c
u
rsive
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-09-07
Elijah Newr
e
n
rever
t
: Fix triv
i
a
l
comment styl
e
issue
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-09-07
Elija
h
Newren
cac
h
e_tree_free: Fix s
m
all m
e
mor
y
leak
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-26
Elijah Newren
dif
f
_tree()
:
Skip skip_unin
t
eresting()
when all remaining
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-26
Eli
j
ah Newren
tree_entry_interesting(): Make return value mo
r
e s
p
e
c
if
i
c
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-26
E
l
ijah
N
ew
r
en
tree-walk:
Corre
c
t bitrotted comment
about tree_ent
r
y()
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-26
Elijah Newren
Docume
n
t
p
re-
c
ondition for tree_entry_inte
r
esting
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-25
Elijah Newren
tree-walk: C
o
rrect bitrotted comment about tree_entry()
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-20
Elijah
Newren
mer
g
e-recursive: Av
o
id excessiv
e
output
f
or and reprocessin
g
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
Elijah Newren
merge-recu
r
s
i
ve:
F
ix
mu
l
tiple file r
e
name across D
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
E
l
ij
a
h Newren
t6031:
Add a testcas
e
cove
r
ing multip
l
e rename
s
across
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
Elijah
Newren
merge-
r
ecursive: Fix typo
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-13
Eli
j
a
h
N
ewre
n
M
ar
k
te
s
t
s that use symlinks
as n
e
eding SYMLINKS prerequisite
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-13
Elijah Newren
pull --rebase: Avoid
s
pu
r
io
u
s
con
f
li
c
ts and reapplying
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-13
Eli
j
a
h Newren
t5
5
20
-
pull
:
Add testcases
s
howin
g
spurio
u
s conf
l
i
c
ts
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-02
E
l
ijah Newren
upload-
p
ack: Improve error mess
a
g
e
w
hen
b
ad ref requested
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-19
Elij
a
h New
r
en
f
ast-ex
p
ort: Add a
-
-
fu
l
l-tree option
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-19
Elijah Newren
fast-export: Fix drop
p
ing
of files with
--import-marks
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-09
Elijah Newren
f
ast-import: Improve robu
s
t
n
ess when D
-
>F ch
a
nges
p
rovided
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-09
El
i
ja
h
Newren
f
a
st-export: Fix output ord
e
r o
f
D/F cha
n
ges
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-09
E
l
i
jah Ne
w
ren
merge_recursive
:
Fix renames across paths below D/F
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-09
Elijah
Newren
merge-
r
ecursi
v
e
:
Fix D/F
c
onfl
i
cts
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-09
Elijah Newr
e
n
Add additional testcases f
o
r D/F conflicts
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-27
E
l
ijah Ne
w
ren
fa
s
t-
e
xport
:
Doc
u
ment the fact that
git-rev-list argu
m
en
t
s
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-27
Elijah Newren
Add ne
w
fast-export testcases
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
next