repo.or.cz
/
git
/
mjg.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'mg/maint-difftool-vim-readonly'
2011-02-03
Elijah Newren
Add testcases
sh
o
w
ing how
path
s
pecs are handled with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-02-03
Eli
j
ah Newren
M
ak
e
rev-lis
t
--o
b
jects
work togeth
e
r
with pathspecs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newren
I
ntroduce
sane_unset and use
i
t to ensur
e
proper
&
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elij
a
h Newren
t
7
800 (
d
iffto
o
l): add m
i
ss
i
ng &&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
E
lijah Newren
t7601 (merge-pull-
c
onfig):
a
dd missing &&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah
Newren
t7001 (mv): ad
d
mi
s
sing &&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newren
t
6
016 (re
v
-list-gr
a
ph-simplify-histo
r
y):
a
dd missing &&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah
N
ew
r
en
t5602 (clo
n
e
-
rem
o
te-exec): add missing &&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elija
h
Newren
t
4
026 (color): remove u
n
needed and unchained command
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newren
t
4019 (diff-wserro
r
)
:
a
d
d lots of miss
i
ng &&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elij
a
h
Newren
t
4202 (log
)
: Replace '<git-
c
omma
n
d> || :' w
i
th test_might_f
a
il
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elija
h
Newr
e
n
t
4
002 (diff-basic
)
: use
tes
t
_mig
h
t_fail f
o
r commands
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elija
h
New
r
e
n
t100[12] (read-tree-m-2way, read_tre
e
_m_u_2way): add
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah N
e
wren
t
4017 (diff-retval
)
:
replace manual
exit
co
d
e c
h
eck
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-04
Elij
a
h Newren
t
3
02
0
(ls-fil
e
s-error-unmatch):
r
em
o
ve stra
y
'1' from
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
l
i
jah Newren
merge-rec
u
rsive: Rem
o
v
e redu
n
dant
path clearing fo
r
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
merge-recursive: Make room for director
i
es in D/F
c
onflicts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Eli
j
ah
N
e
w
r
en
handle_delete_modify(
)
: Chec
k
whethe
r
D
/F
c
on
f
licts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
m
e
rge
_
c
o
ntent(): Check whether D/F conflicts are sti
l
l
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
c
o
nflict_rename_re
n
a
m
e_1to2():
F
ix
c
hecks for presence
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
conflict_rename_delete
(
): Check whe
t
her
D
/F conflict
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
merge-recursive
:
Del
a
y modify/delete
c
o
nfl
i
ct
s
if D
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newre
n
merge-recu
r
sive: Delay cont
e
nt merging for renames
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
me
r
ge-recur
s
ive: Dela
y
handling of rename/delete conflicts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
l
i
ja
h
Newren
m
erge-recursive: Move ha
n
dli
n
g of double rename of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
merge-recur
s
ive: Move handl
i
ng of d
o
uble rename of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
m
e
r
g
e-recursive: Avoi
d
do
u
bly me
r
g
i
ng rename/add conf
l
ic
t
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
merge-recurs
i
ve
:
Updat
e
merge_co
n
t
ent
(
) call signature
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
merg
e
-recursive:
U
pdat
e
c
on
f
lict_rename_
r
ename_1to2
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
l
ija
h
Newre
n
merge-rec
u
r
s
i
v
e: Structure p
r
oces
s
_
d
f_e
n
try() to handle
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
merge-recur
s
i
v
e: H
a
ve p
r
ocess_e
n
try() skip
D/F or rena
m
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newr
e
n
m
er
g
e-recursive
:
New
fu
n
ction to assist resolving renames
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
El
i
jah Newren
merge-recursive:
N
e
w
d
a
t
a structures for de
f
e
rring
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
l
i
jah Newren
merge-recursive: M
o
ve process_entry's content merging
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
merge-recursive: Move
de
l
ete/modify han
d
ling i
n
to dedicated
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newr
e
n
merge-recursiv
e
: Move rename/delete h
a
ndling int
o
dedicated
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah
New
r
en
merge-recu
r
sive: Nuke
r
e
name/d
i
re
c
tory conflict de
t
e
c
t
i
on
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
lijah Newren
mer
g
e-
r
ecursive: Rename conflict_rename_rename*()
f
or
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
merg
e
-
r
e
cursive:
S
mall code clar
i
fication
-- variable
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
t
6
036: Add testcase f
o
r undetected
conflict
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah New
r
en
t6036: Add a
second testcase
s
imilar
t
o the first
b
u
t
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
t6036: Test index and wo
r
k
t
ree s
t
a
t
e, not
just that
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Ne
w
ren
t
6020: Ad
d
a testcase for m
o
dify/delete
+
d
irecto
r
y
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
l
ijah N
e
wr
e
n
t6020: Modernize style a bit
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
El
i
jah Newren
t
6022: Ad
d
tests for re
n
a
m
e
/rena
m
e combined with D
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Ne
w
ren
t6022:
A
d
d paired rename+D/F
c
onflict: (two/
f
ile,
o
ne
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newre
n
t6
0
2
2
: Add tests with b
o
th rename s
o
u
r
ce & de
s
t
involved
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah New
r
en
t6022:
Add test
s
fo
r
r
e
versing order of
m
erges when
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Eli
j
ah Newren
t6022:
A
dd
test combinations
o
f {content conflic
t
?
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
l
i
ja
h
Newren
t6
0
3
2:
A
d
d a test checking for e
x
cessive output fr
o
m
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-10
Elijah New
r
e
n
merge-r
e
cursive:
D
/F
c
onf
l
icts where was_a_dir
/
file
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-10
Elijah Newren
t
3
509: Add rename + D/F confl
i
c
t
testcase that recursi
v
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-07
Elijah Newren
revert: Fix
t
r
i
vial comme
n
t
st
y
le
issue
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-07
Elijah Newren
cache_tree_free:
F
ix small m
e
mory lea
k
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-26
E
l
i
j
ah New
r
en
diff_tree()
:
Skip s
k
i
p_un
i
nter
e
s
t
i
ng() when all remaining
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-26
El
i
jah Newren
t
ree_entry_interesting(): Make
r
e
turn value more specific
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-26
Elijah Newr
e
n
tree-wal
k
:
C
orrec
t
b
itr
o
t
t
ed comment about
tree_entry(
)
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-26
E
l
ijah Ne
w
ren
Document pre-cond
i
t
ion
for tree_e
n
try_inter
e
sting
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-25
E
lijah
N
ewren
t
r
e
e
-
walk: Corr
e
ct bitrotted com
m
ent
a
bou
t
tre
e
_entry()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-20
E
lijah N
e
wr
e
n
merge-recursi
v
e: Av
o
i
d excessive output for and
r
eproce
s
sing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Elijah Newren
m
erge
-
recu
r
sive: Fix multiple file re
n
ame across D
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Elijah Newren
t
6
031: Add a te
s
tcase covering
mu
l
tipl
e
renames across
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Elijah Newr
e
n
merge-recursiv
e
: Fix typ
o
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-13
Eli
j
ah Newren
Ma
r
k tests
t
hat use symlinks as needing SYMLINKS pr
e
requisite
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-13
E
lijah Newren
pull --rebase: Avoi
d
s
p
urious confl
i
cts and
rea
p
plying
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-13
Elija
h
Newre
n
t
5
5
2
0-pull: Add
t
estcas
e
s showing spurious conflicts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-02
El
i
ja
h
New
r
en
u
p
load-pa
c
k: Im
p
ro
v
e e
r
ro
r
m
e
s
sage when
b
ad ref requested
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
Eli
j
ah New
r
en
fast
-
expor
t
:
Add a --
f
ull-tree option
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
Elijah Newren
fast-
e
xport:
F
ix
dropping o
f
file
s
w
i
th --impor
t
-
mar
k
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-09
E
lijah
N
e
w
ren
fas
t
-import:
I
mprove robu
s
tnes
s
when D->F changes provided
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-09
Elijah Newre
n
fast-export: Fix output order of D/F c
h
ange
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-09
Elija
h
Newr
e
n
me
r
ge_recursive: Fix renames across
paths below
D
/
F
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-09
Elijah Newr
e
n
me
r
ge-recursive: Fix D
/
F c
o
nflicts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-09
E
lijah Newren
Add addit
i
onal
t
estcases for
D/F con
f
licts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-06-27
E
lija
h
New
r
en
fast-
e
xport: Documen
t
the fac
t
that
g
it-r
e
v-list arguments
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-06-27
Elij
a
h Newre
n
Ad
d
new
f
ast-expo
r
t
tes
t
case
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-06-27
E
l
ijah Newren
fas
t
-export
:
A
d
d a
-
-t
a
g-of-fi
l
tered
-
object option
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-06-27
Elijah Newren
fast
-
expor
t
:
D
o parent rewriting
t
o a
v
oid droppi
n
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-06-27
Elijah Newre
n
fast-export: Make sure
we
s
ho
w
actual ref names instead
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-06-27
Elijah Newren
fas
t
-export
:
Omit tags that tag
trees
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-06-27
Elijah Ne
w
ren
f
a
st-expo
r
t: Set revs
.
topo_order before calling setup_revisio
n
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-05-16
Elija
h
Newre
n
gitk
:
Make more op
t
ions ea
s
il
y
accessible from Edit
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-03-26
Elijah Ne
w
ren
fa
s
t-
e
xport: Av
o
id
d
roppi
n
g files from co
m
mits
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-03-25
E
l
i
jah
Newren
Correct missi
n
g SP ch
a
ra
c
te
r
s
in gram
m
ar comment at
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-03-25
Elij
a
h
Newren
g
it-fi
l
ter-bra
n
c
h
:
avoid collisions wi
t
h va
r
iables
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-02-28
Elijah N
e
wren
Ensure proper s
e
tup of git_
d
i
r for git-hash-object
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-02-12
Elijah Newren
fas
t
-
e
xport: ensure we
t
rave
r
se commits in topological
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree