repo.or.cz
/
git
/
jnareb-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'maint' to sync with Git 1.7.3.3
2010-10-06
E
l
ijah N
e
wren
Introdu
c
e
s
ane_u
n
set a
n
d use it t
o
ensure pro
p
er &
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newren
t780
0
(difftool): add
m
issi
n
g
&
&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newren
t7601 (
m
erge-
p
ull-conf
i
g):
a
dd m
i
s
s
ing
&&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
E
l
ijah N
e
wren
t7001
(
mv): a
d
d mi
s
sing
&
&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newren
t6016 (rev-list-graph-simplify-h
i
story): a
d
d
m
issin
g
&&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newren
t
5602 (clone-remote-exec
)
: add missing &&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Eli
j
ah New
r
en
t
4
0
2
6
(
color):
r
emove u
n
needed and u
n
chained
command
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
E
l
ijah Newr
e
n
t
4
0
1
9 (dif
f
-ws
e
r
ro
r
):
add lots of missi
n
g &&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newren
t42
0
2 (log): Replace '<git-comma
n
d
> || :'
w
ith test_m
i
g
h
t_fail
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
El
i
j
a
h
Newren
t4002 (diff-basic): use te
s
t_migh
t
_fail
f
o
r
co
m
mands
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elij
a
h Newren
t100[12
]
(
read-
t
ree-m-2way, read_tree_
m
_u_
2
way
)
: add
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah New
r
en
t
4
017 (diff-r
e
t
v
al): replace man
u
al exit code check
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-04
Elijah N
e
wre
n
t3
0
20
(l
s
-fil
e
s-error-unmatch): remov
e
stray '1'
f
r
om
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
l
i
jah Newren
merge-recursive: Remove redundant pat
h
cl
e
a
r
ing f
o
r
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
merge-recur
s
ive: Make room for directori
e
s in D/F c
o
nflicts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
li
j
a
h
Newre
n
handl
e
_delete_modify(): Check whe
t
h
e
r D/F conflicts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Eli
j
a
h
Newr
e
n
merge_c
o
n
t
e
n
t(): Ch
e
ck whether
D
/F c
o
nflicts are
sti
l
l
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elij
a
h Newren
conflict_rename_rename_1t
o
2(): Fix checks
f
or presen
c
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Eli
j
ah Newren
c
o
nflict_ren
a
me_delete():
Check whether D/F
c
on
f
lic
t
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
l
ijah Newren
m
e
r
g
e-recursi
v
e: Delay mod
i
fy/delete conflicts
i
f
D
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
l
ija
h
Ne
w
ren
merg
e
-recursive: Delay cont
e
nt
merging fo
r
renames
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
El
i
jah
Newren
merge-recursive: Delay hand
l
i
ng o
f
rename/
d
elete
confli
c
ts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elij
a
h Newren
merge-r
e
c
u
rs
i
ve: Move h
a
ndling o
f
double
ren
a
me of
.
.
.
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 of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah New
r
en
merge-recursive: Avoid doubl
y
mergin
g
re
n
ame/add conflict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
merge-rec
u
rsive
:
Update m
e
rge_conten
t
() call signa
t
ure
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Eli
j
ah Newren
merge
-
recursive: Update conflict_rename_
r
ename_1to
2
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
l
ijah New
r
en
merge-recursive: Struc
t
ure pr
o
cess_d
f
_entry() to
h
andle
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah New
r
en
merge-recursive:
H
a
v
e p
r
ocess_e
n
try() skip D/F or ren
a
m
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
El
i
jah
Newre
n
merge-recursi
v
e: Ne
w
function to assist res
o
lv
i
ng renames
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elija
h
Newren
m
e
r
g
e
-recurs
i
ve
:
New
d
ata st
r
uctures f
o
r d
e
fe
r
ring
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
merge-recursive:
M
ove pro
c
e
s
s_entry's content merging
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
El
i
j
a
h Newren
merge
-
recursive: Move delete/m
o
dify handling into dedicated
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
merge-recursiv
e
: Move rename/de
l
ete handling
i
n
t
o de
d
icated
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
l
ijah Newr
e
n
merge-recu
r
sive: Nuke
rename/dir
e
ctor
y
c
onflic
t
detection
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
merge-
r
ecursive:
R
en
a
me conflict_rename_rename*() for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Ne
w
r
e
n
mer
g
e-recursive: Small cod
e
clarification --
variable
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
l
ijah Newren
t6036
:
A
d
d t
e
s
tca
s
e
for undetect
e
d
conflic
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newre
n
t6036: Add a s
e
cond testca
s
e s
i
milar to t
h
e
f
irst but
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
El
i
jah Newren
t
6036: Test index and worktree state, not
just that
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newre
n
t6
0
20: Add a testcase fo
r
modify/delet
e
+
d
i
r
ector
y
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elija
h
Newren
t6020: Modern
i
z
e
s
t
yle
a
bit
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
l
i
jah
N
ewren
t6
0
22:
A
dd tests
f
o
r rena
m
e/ren
a
m
e
combined
w
ith D
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elija
h
N
e
wren
t6022: Add
paired
re
n
am
e
+
D/
F
c
o
nf
l
ict
:
(two/file
,
one
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
l
i
j
ah
N
ewren
t602
2
:
A
dd tests with both rename source & dest
involved
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elija
h
Newren
t6022: Add tests f
o
r reversing order of merges
w
h
en
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah
N
e
w
ren
t6022:
A
d
d
test combi
n
ations
of {con
t
e
n
t
c
onflict?
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
l
ijah Newren
t60
3
2: Add
a
test checking for excessive out
p
ut from
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-10
E
l
ijah N
e
wren
merge
-
recursive:
D/F confli
c
ts where
was_a
_
dir/file
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-10
Elijah New
r
en
t3509: Add renam
e
+ D/F c
o
nflic
t
testcase that recursive
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-07
Elijah New
r
en
r
e
ver
t
: F
i
x
t
rivial com
m
ent style issue
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-07
Elijah Newren
c
ache_tree_free: Fix s
m
al
l
memory leak
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-26
Elijah Newren
diff_
t
re
e
()
:
Skip skip_unint
e
resting() when all rem
a
i
n
ing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-26
Elijah Newren
t
ree_entry_int
e
re
s
ting(
)
: Make return
v
a
lue more specific
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-26
Elijah Newren
tre
e
-
w
al
k
:
Correct b
i
trotted comment ab
o
ut
t
ree_entry()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-26
Elija
h
Newren
D
o
cument p
r
e
-
c
ondition for tree_entry_in
t
e
res
t
ing
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-25
El
i
jah Newre
n
tree-walk: Correct bi
t
rotte
d
comment
a
bout tree_e
n
t
r
y()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-20
Elijah Newren
merge-r
e
cursive: Avoid excessive output f
o
r and reproc
e
ssing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Elijah Newren
mer
g
e-recurs
i
ve: Fix multip
l
e file re
n
ame across D
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Elijah Ne
w
re
n
t6031: A
d
d a testcase cov
e
ring mul
t
iple r
e
names across
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Elijah Newren
merge-r
e
cursive:
F
i
x ty
p
o
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-13
E
l
ij
a
h Newren
Mark te
s
ts that use s
y
mli
n
ks as n
e
eding SYML
I
NK
S
pr
e
requisite
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-13
Elijah Newren
pull
-
-rebas
e
: Av
o
id
spurio
u
s co
n
flicts and reapplyin
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-13
El
i
jah Newre
n
t552
0
-pull: Add testc
a
ses showing spurious confl
i
cts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-02
Elijah
Newren
upload-pack: Improv
e
error messa
g
e when bad
r
e
f
requested
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
Elijah Ne
w
ren
fast-exp
o
rt:
A
dd
a
--f
u
ll-tree option
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
E
l
ijah Newr
e
n
fast-e
x
port: F
i
x
dro
p
ping of
f
iles wit
h
--import-marks
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-09
El
i
jah Newren
fast-
i
mport:
I
m
prove ro
b
u
stness w
h
e
n D->F changes provided
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-09
E
l
i
j
a
h
New
r
e
n
fast-
e
xpo
r
t: Fix o
u
tput order
o
f
D
/F changes
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-09
E
l
ijah Newren
m
erge_recur
s
ive:
Fix rena
m
es across pa
t
h
s
below D/
F
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-09
Eli
j
ah N
e
wren
merg
e
-rec
u
rsive
:
Fix D/F conflicts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-09
Elija
h
Ne
w
ren
Add additi
o
n
a
l test
c
ases f
o
r D/F conf
l
icts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-06-27
Elijah
Newren
f
a
st-export: Document
the
fact that
g
i
t-r
e
v-list arguments
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-06-27
El
i
jah New
r
e
n
Add new fast-export testcase
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-06-27
Elijah Newr
e
n
fas
t
-
e
xport:
Add a --t
a
g
-of-filtere
d
-object
option
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-06-27
Elija
h
Newren
fa
s
t-export: D
o
pa
r
ent rewriting to avoid dropping
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-06-27
Elijah Newren
fast-export:
M
ake sur
e
w
e
show
a
ctual ref names in
s
tead
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-06-27
Elijah Newren
fa
s
t-export: Omit tags that tag trees
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-06-27
Elijah Newren
fa
s
t
-export: Set revs
.
topo_
o
rder
b
efor
e
cal
l
i
n
g setup_revisions
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-05-16
E
l
i
j
a
h
New
r
en
gitk: Make m
o
r
e
opti
o
ns
e
asily accessible from Edit
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-03-26
El
i
jah Newren
fast
-
e
xp
o
rt:
A
void drop
p
i
ng files
f
rom
commit
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-03-25
El
i
jah Newre
n
C
o
r
r
e
c
t
missing
SP characters i
n
g
r
a
mmar comment
a
t
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-03-25
Elijah Newren
git-f
i
lter
-
branch
:
avoi
d
collisions
w
i
t
h variables
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-02-28
E
lija
h
Newren
Ensure proper setup of
git_dir for git-hash-object
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-02-12
Elijah Newren
f
a
st-export: ensure we
t
raverse com
m
its in topologi
c
al
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree