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
Elijah Newren
t6
0
42:
A
dd
a
pair of c
a
ses
wh
e
re undetect
e
d
renames
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t
6042
:
Add fail
i
n
g
t
est
c
ase for r
e
name
/
m
odif
y
/add-source
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t
6
0
42: Add a testcas
e
w
h
e
re git
deletes
a
n u
n
tracked
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-03
Elijah Newren
A
dd t
e
stcases showing how p
a
thspec
s
are handl
e
d with
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-03
Elijah Newren
Ma
k
e
rev-lis
t
-
-
objects w
o
rk tog
e
ther
w
i
t
h
p
ath
s
pecs
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-10-06
Eli
j
ah Newren
Int
r
oduce sane_unset and use it
t
o
ensure
p
roper &
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-10-06
El
i
jah Newren
t7800 (
d
ifftool): add
missing
&
&
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newre
n
t7
6
01 (merge-pull-c
o
nfi
g
):
add
miss
i
ng &
&
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newren
t7001 (mv):
ad
d
missing &&
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newren
t
60
1
6 (rev-li
s
t-graph-simplify-history
)
: add missing &&
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-10-06
El
i
jah Newren
t
5
60
2
(clone-remote-exec
)
:
add missi
n
g &
&
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newren
t402
6
(col
o
r): r
e
move unne
e
ded
a
n
d
unc
h
ained command
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-10-06
Elijah
N
ewren
t4019 (di
f
f-wserror): add lots of
missing &
&
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-10-06
Eli
j
ah Newren
t4202 (log):
Repl
a
c
e '<git
-
com
m
an
d
> || :' with test_
m
ig
h
t_fail
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newren
t4002
(
diff-b
a
sic):
use test_might_fa
i
l
for com
m
a
nds
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-10-06
Elijah
N
ew
r
en
t
1
00
[
12]
(read-tree-m-2
w
ay, r
e
a
d
_
tree_m_u_2wa
y
): add
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-10-06
E
l
ijah
N
ewren
t401
7
(diff-retv
a
l
)
: re
p
lace m
a
nual
e
xit
code
c
heck
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-10-04
E
lijah Newren
t3020 (ls-files-
e
rror-unma
t
ch): remove stray '1' f
r
o
m
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-09-30
Elijah
N
e
w
r
e
n
m
erge-recursive:
R
e
m
o
ve
redundant
p
ath
cl
e
ar
i
ng f
o
r
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
merge-
r
ecursive: Make
r
oom
f
or directories in D/F
c
onf
l
icts
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-09-30
Elijah
N
ewren
handle_delete_modify(
)
: Chec
k
whe
t
her D/F conflic
t
s
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
mer
g
e_cont
e
nt(): C
h
eck
whether D/F
c
onflicts are
still
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Ne
w
r
e
n
c
o
nflic
t
_
r
ena
m
e
_
rename_1to2()
:
Fix chec
k
s fo
r
presenc
e
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
conflict_rename_delete()
:
Ch
e
ck whet
h
er D/F conflicts
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
merge-re
c
ursive:
D
elay modify/delete conflicts
if D
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-09-30
Elij
a
h
Newren
merge-re
c
ursive: De
l
ay content merg
i
n
g
for r
e
names
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newr
e
n
merge-recursive:
Delay handli
n
g of ren
a
me/delete
c
onflict
s
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-09-30
E
lijah Newren
merge-recursive
:
Move handling
o
f
double rena
m
e of
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-09-30
Eli
j
ah Ne
w
r
e
n
me
r
ge-recursive:
Move handling o
f
double rename of
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-09-30
El
i
jah N
e
w
r
en
m
e
rge-recursive: Avoid do
u
bly
merging rename
/
add c
o
nflict
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
mer
g
e-recursive
:
U
p
date me
r
ge_
c
ont
e
n
t
(
)
ca
l
l
signat
u
re
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
merge-re
c
ursive: Update conflict_r
e
name_rena
m
e_1to2
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-09-30
Elijah
N
ewren
merge
-
r
ecur
s
iv
e
: Structure
proce
s
s
_
d
f
_entry()
to handl
e
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-09-30
Elijah
N
e
w
ren
merge-recu
r
sive:
H
a
v
e process_
e
ntry() skip D/F or rename
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-09-30
Elij
a
h
Newren
merge
-
recursi
v
e: New function to assist resolving rena
m
es
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
merge-recursive: New dat
a
structures for
de
f
e
r
ring
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newre
n
m
e
rge-recursive: Mo
v
e p
r
o
c
ess_entry's conte
n
t
mer
g
ing
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-09-30
Elijah
Newren
merge-recursive: Mo
v
e delete/modify handling into dedicated
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-09-30
E
l
i
jah New
r
en
m
erge
-
recursive: M
o
ve r
e
n
am
e
/de
l
ete handli
n
g into dedicated
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newre
n
mer
g
e-recursive: Nuke rename/di
r
e
ctory
c
o
nfl
i
c
t
de
t
ection
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-09-30
El
i
jah
N
ewren
merg
e
-r
e
cursiv
e
:
Renam
e
co
n
flict_r
e
name_r
e
name*() for
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-09-30
Elijah N
e
wr
e
n
merge-re
c
ur
s
ive:
Small code clarification -- variable
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
t6036: Add testcase for undetected conflict
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-09-30
E
l
ij
a
h Newren
t6
0
36: Add
a secon
d
tes
t
ca
s
e similar to the
f
i
rst but
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-09-30
E
l
ijah N
e
wren
t6
0
36
:
T
est index
and work
t
ree state, not j
u
st that
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-09-30
E
l
ijah Newren
t6020: Add a t
e
stcase for
m
odify/dele
t
e
+
di
r
ect
o
ry
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-09-30
Elija
h
Ne
w
r
en
t60
2
0: M
o
dernize
s
tyle a bit
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-09-30
Elija
h
Newren
t6022: Add
tests for ren
a
m
e
/re
n
ame
combi
n
ed with D
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
t6022: Add
p
a
ired rename+D/F confl
i
ct:
(
two
/
file, one
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-09-30
Eli
j
a
h New
r
en
t
6
0
2
2:
Add tests
with both
rename sour
c
e
& dest involved
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
t
6022: Add tests for reversing o
r
der of merges w
h
en
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-09-30
Elija
h
Newren
t6
0
22: Add t
e
st combin
a
tions of {content co
n
flict?
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-09-30
Elija
h
N
ewren
t6032: Ad
d
a te
s
t
c
h
ecking
for excessiv
e
outp
u
t fr
o
m
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-09-10
Elijah
N
ewren
me
r
ge
-
recursive: D/F co
n
flict
s
whe
r
e
w
a
s_a_dir/fi
l
e
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-09-10
E
l
ijah N
e
wren
t3509: Add rename
+
D/F c
o
nflict testc
a
se th
a
t recursiv
e
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-09-07
Elijah Newre
n
revert: Fix trivial comment style issue
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-09-07
Elijah Newren
c
a
che
_
tree_free: Fi
x
s
mall me
m
ory l
e
a
k
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-26
El
i
j
ah Newren
diff_tree(): Skip skip_
u
n
interesting() when a
l
l
r
emaining
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-26
E
lijah Newren
tree_en
t
ry_i
n
t
e
restin
g
(): Make
return
v
alue more spec
i
fic
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-26
E
lijah Newre
n
tree
-
walk: Correct
b
itrotted comment about tr
e
e
_
entry()
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-26
Elij
a
h Newren
D
ocum
e
nt
p
re-c
o
nditio
n
f
or tree_entry_
i
n
t
er
e
sting
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-25
Elijah New
r
en
tr
e
e-
w
al
k
: Correc
t
bitr
o
tte
d
c
omment ab
o
u
t tre
e
_e
n
try()
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-20
Elijah Ne
w
ren
m
e
r
ge-recursive: Avoid
e
xcessive o
u
tpu
t
for
a
nd rep
r
oc
e
ssing
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
Elij
a
h Newren
merge-recursive: Fix multiple file rename across D
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
Elijah Ne
w
ren
t
6
031: Add
a
testcase covering mul
t
iple rena
m
e
s
a
cross
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
Elijah Ne
w
r
en
m
e
rge-r
e
cursive: F
i
x typo
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-13
Elijah Newren
Ma
r
k te
s
ts that use symlink
s
as n
e
eding SYML
I
NK
S
prere
q
uisite
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-13
Elijah Newren
pull
--reb
a
se: Avoid sp
u
rious
c
o
n
f
lict
s
and reapplying
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-13
Elijah
N
ewren
t5520-p
u
ll: Add testcas
e
s showing sp
u
rious con
f
licts
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-02
Elija
h
Newren
uplo
a
d-pac
k
: I
m
pr
o
ve error message when
b
ad
r
ef r
e
quested
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-19
Elijah N
e
wren
fast-ex
p
ort: Add a --ful
l
-tree option
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-19
Elijah Newren
fast-e
x
port: Fix dropping of fil
e
s with --impo
r
t-
m
a
rks
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-09
Elijah Newren
fa
s
t-import: Improve robus
t
ness when
D->F ch
a
nges provided
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-09
E
l
ijah Ne
w
r
e
n
fas
t
-export: Fi
x
output ord
e
r of D/F change
s
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-09
Elijah
N
e
wren
merge_recursi
v
e: Fix renames acro
s
s paths below D/F
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-09
Elij
a
h Newren
merge-recursive: Fix D/F
c
onflicts
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-09
E
l
ijah Newren
Ad
d
additio
n
al testcases for
D/F
conflicts
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-27
Elijah N
e
wre
n
fast
-
export: Document
t
he fact
that git-
r
ev-list arguments
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-27
Elijah New
r
en
Ad
d
new fast-expo
r
t testcas
e
s
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-27
Elija
h
N
e
wren
fast-export: Ad
d
a --tag
-
of-filt
e
re
d
-objec
t
o
p
t
ion
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-27
Elija
h
Ne
w
ren
fast-export: Do parent
r
ewrit
i
n
g
to avoid dropping
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-27
Eli
j
ah N
e
wren
fast-
e
xport:
Mak
e
sur
e
we show actual ref names inst
e
ad
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-27
Eli
j
ah N
e
wren
f
a
st
-
export: Omit
t
ags that tag trees
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-27
Elij
a
h
N
ewren
fast-export: Set revs
.
t
o
p
o_order before calling s
e
tup_r
e
visions
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-16
Elijah Ne
w
r
e
n
gitk: Make more op
t
ions e
a
s
ily
a
cce
s
sible from
E
d
it
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-26
E
l
ijah
Newren
fas
t
-ex
p
o
rt: Avoi
d
d
r
opping file
s
from commits
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-25
Elijah Newren
Co
r
re
c
t missing SP
character
s
in grammar
comment a
t
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-25
El
i
jah Newren
git-filter-br
a
nch: avoid collisions
w
ith variables
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2009-02-28
Elijah Newren
Ensure pro
p
er setup of git_dir for
git-hash-object
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2009-02-12
Eli
j
a
h
Newren
fast-e
x
port: ensure we traverse com
m
i
t
s in topological
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree