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
Merge branch 'master' into next
2011-02-03
E
l
ijah N
e
wren
Add testcases show
i
ng ho
w
pa
t
hspecs are handled with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-02-03
E
l
ijah Newren
Make rev-
l
ist --object
s
work to
g
et
h
e
r
with paths
p
ecs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
E
l
ijah
Newren
Introduce sane_un
s
et
a
nd use it to ensure proper
&
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
El
i
jah Ne
w
ren
t7800 (dif
f
tool): add missing &&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elija
h
Newren
t
7
601 (me
r
ge-pul
l
-config
)
: add missing &
&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newren
t7001
(mv)
:
add missing &&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah N
e
wren
t60
1
6 (rev-list-graph-simp
l
ify-history): ad
d
missi
n
g &&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah
Newren
t5602
(clo
n
e-r
e
mote-exec)
:
add missing
&&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newren
t
4
026
(color
)
: remove
u
nneeded a
n
d unchain
e
d comman
d
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newren
t4019 (diff-wserror):
a
dd lots of missing
&
&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
E
l
ijah Newren
t4202 (log): Re
p
lace '<git-command
>
|
| :' w
i
th test_mi
g
ht_fail
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newre
n
t40
0
2
(diff-basic
)
: use
t
est
_
mi
g
h
t
_fail for c
o
m
mands
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah
N
ewren
t100[12] (read-tr
e
e-m-2way, read_tree_m_
u
_
2way): add
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
E
l
i
jah Ne
w
r
e
n
t
4017 (di
f
f-re
t
val): replace
man
u
al exit code check
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-04
Elijah Ne
w
ren
t
3
020
(ls
-
files-error-unmatch): re
m
ove
s
tray '
1
' from
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
l
ijah Newren
me
r
g
e
-
recursive: Remove redundant p
a
th cle
a
rin
g
for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elij
a
h Newren
merg
e
-recurs
i
ve:
M
ake ro
o
m for directori
e
s in D/F c
o
nflicts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
h
a
ndle_del
e
t
e
_modify(): Check
wh
e
ther D/F conflicts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
El
i
j
ah N
e
w
ren
merge_
c
ontent()
:
Ch
e
ck whet
h
er D/F co
n
flict
s
are s
t
ill
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elija
h
Newren
confli
c
t_ren
a
me_rename_
1
to2(): Fi
x
chec
k
s for presence
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
conf
l
i
c
t_
r
ena
m
e_delete(
)
:
Check w
h
ether
D
/F conflicts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
me
r
ge-recursive: D
e
la
y
modify/delete
c
onflicts if D
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
merge-recursive: Delay content mergi
n
g for renames
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah N
e
w
r
en
merge
-
recursi
v
e: Del
a
y
h
andl
i
ng of renam
e
/
dele
t
e conf
l
ict
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
merge
-
recursive: Move han
d
ling of
double rename o
f
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
lijah Ne
w
ren
merge-recurs
i
ve: Mov
e
handl
i
ng of double re
n
ame of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah
New
r
en
m
erge-recu
r
sive: Avoid doubly merging re
n
ame/add conflict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
El
i
jah
N
ewr
e
n
me
r
ge-recursive:
U
p
date me
r
ge_con
t
ent() call signature
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Ne
w
re
n
merge-rec
u
rsive: Update conflict_ren
a
me_rename_
1
t
o
2
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
merge-rec
u
rsive:
S
t
r
uctu
r
e process_df_entry() to handle
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
m
er
g
e-recurs
i
v
e
: Have p
r
ocess_entry() sk
i
p D/F or r
e
name
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
merge-rec
u
rsive:
N
ew fu
n
cti
o
n
t
o assi
s
t resolv
i
ng renames
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
lijah Newren
me
r
g
e-recursive: New data
s
tructures
f
or deferri
n
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elij
a
h Newren
merge-recur
s
ive
:
Move
proc
e
ss_entry's
c
ontent merging
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elija
h
Newr
e
n
mer
g
e-
r
e
c
ursive
:
Mov
e
d
e
lete
/
modify han
d
ling in
t
o dedicated
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
lijah
N
ewren
merge-recursive: Move rename/de
l
e
t
e handling into dedica
t
ed
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elij
a
h Newren
m
erge-rec
u
rsive: Nu
k
e rename/directory confl
i
ct detecti
o
n
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
El
i
jah New
r
en
merge-rec
u
rs
i
ve:
R
ename conf
l
ict_rename_
r
en
a
me
*
() for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Ne
w
ren
merge-
r
ecurs
i
ve: Sm
a
l
l co
d
e
clarifi
c
ation -- va
r
iable
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elija
h
N
e
wren
t6036
:
Add
t
e
s
tcase for un
d
etected conf
l
i
c
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newre
n
t6036: Add a second testcase similar to the fir
s
t but
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
t6036: Test index and worktree sta
t
e, not just that
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
t6020: Add a testcas
e
for modif
y
/delete + direct
o
ry
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
lijah
N
e
w
ren
t6020: Modernize s
t
y
le
a bit
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
l
i
jah Newren
t6022: A
d
d tests fo
r
ren
a
me/
r
en
a
me combined with D
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
l
ijah Newr
e
n
t6022
:
Add pa
i
red rename+D/F conflict: (two/file
,
one
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Eli
j
ah Newren
t6022: Add tests with both ren
a
m
e
source
&
dest
involved
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
l
ijah Newr
e
n
t6022: A
d
d
tes
t
s
for reversi
n
g
order of merges whe
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Ne
w
ren
t6022:
A
dd
te
s
t
combinations of {cont
e
nt c
o
nflict?
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
lijah Newren
t
6032: Add a test checking for
exces
s
ive
output from
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-10
Elij
a
h Newren
mer
g
e-r
e
cursive:
D/F
conflicts wher
e
was_a_dir/file
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-10
Elijah Newren
t
3
509: Add r
e
n
a
me
+ D/F confl
i
c
t
te
s
tcase
that recursive
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-07
Elijah Newren
revert: Fix trivial
comment s
t
y
l
e
issue
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-07
Elijah Newren
cache_tree
_
free: Fix small m
e
m
ory leak
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-26
Elija
h
Newren
diff_tree():
Skip s
k
i
p_u
n
intere
s
ting
(
)
w
hen all rema
i
ning
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-26
Elijah Ne
w
re
n
tree_ent
r
y_interesting(): Make re
t
urn value more specific
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-26
Elijah Newren
tree-walk
:
Correct bi
t
rotted commen
t
about
t
r
e
e_entry()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-26
Elijah
Ne
w
ren
Document
p
re-condition for tree
_
entry_int
e
re
s
ting
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-25
E
lijah Newr
e
n
tree-walk: Correct
bitrotted
c
ommen
t
about tree_
e
ntry()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-20
Elijah
N
ewren
merge-r
e
cursive: Avoi
d
e
xcess
i
ve
outpu
t
f
o
r
and repr
o
cessing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Eli
j
ah Newren
me
r
g
e
-
r
e
cursive:
Fix m
u
l
t
i
ple file
renam
e
across D
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Elijah N
e
wren
t6031: Add a testca
s
e cove
r
ing mul
t
iple rename
s
acr
o
ss
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
E
l
ijah Newren
merge-re
c
ursive: Fix typo
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-13
Elijah N
e
wren
Mark tests
t
hat
u
s
e
s
ymlinks as needing SYMLINKS prereq
u
isite
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-13
E
l
ijah Newren
pul
l
--
r
e
b
ase: Avoid spurio
u
s
confli
c
ts and reapplying
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-13
Elija
h
New
r
en
t5
5
20-pull: Add
testcases showing spurious conflic
t
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-02
Elijah Newren
u
p
load-p
a
ck:
Improve error mess
a
ge when bad re
f
requested
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
Eli
j
ah Newren
fast
-
exp
o
rt: Add a --full-t
r
ee
o
ption
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
E
l
ijah Newren
fas
t
-export: Fix dropping of fi
l
es with -
-
import-mar
k
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-09
El
i
jah New
r
e
n
fast-import: Impro
v
e robustness when
D
-
>F chang
e
s provide
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-09
Elijah N
e
wre
n
fast-export: Fix output orde
r
of D/F
c
hanges
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-09
Elijah Ne
w
r
e
n
merge
_
recursive:
Fix
renames acros
s
path
s
below
D
/F
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-09
Elijah Newren
merge-recursiv
e
:
Fix D/F conflicts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-09
Eli
j
ah Newren
Add additional testcases for D/F conflict
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-06-27
Elij
a
h Newr
e
n
fas
t
-export: Document the fact
t
hat
git-rev-list arguments
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-06-27
Elijah Newren
Add ne
w
fas
t
-expor
t
testcases
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-06-27
E
lija
h
N
e
wren
fast-
e
x
p
ort:
A
d
d
a -
-
tag-of-filt
e
red-
o
bject op
t
ion
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-06-27
Elijah Newren
fa
s
t-export:
D
o parent rewriting to
a
v
oid dropping
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-06-27
Elijah N
e
wren
f
as
t
-expor
t
: Make
sure we show ac
t
ual
r
ef na
m
es inste
a
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-06-27
Eli
j
ah Newren
fast-export: Omi
t
tags that t
a
g tr
e
es
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-06-27
E
lijah New
r
e
n
fast-export: Set re
v
s
.
t
o
po_
o
rder before calli
n
g
setup_
r
evisio
n
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-05-16
Elijah Newr
e
n
gitk: Make more opti
o
ns easily
a
ccess
i
ble f
r
om E
d
it
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-03-26
Elijah Newren
fast-
e
xport:
A
v
o
id
dropping file
s
from commi
t
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-03-25
El
i
jah Newren
C
o
rrect miss
i
ng SP chara
c
t
ers in grammar
c
omment at
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-03-25
Eli
j
ah New
r
en
git-filter-branch: avoid collisio
n
s with v
a
riab
l
es
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-02-28
Elijah Newren
E
n
su
r
e prope
r
setup
of
git_dir
for git
-
hash-object
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-02-12
Elijah Newren
fast-export: ensure
we
traverse commits in
topological
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree