repo.or.cz
/
alt-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 'tg/use-git-contacts'
2011-08-14
E
l
ijah Newren
t
6
042
:
Add
t
e
s
ts for co
n
tent issue
s
with modify/rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah
N
ewren
t
6
042: Add a testcase where undetected re
n
a
m
e causes
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah Newren
t6042:
A
d
d a pa
i
r of
cas
e
s where undetected r
e
n
a
mes
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6042:
Add faili
n
g testcas
e
for re
n
ame/modify/add-source
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6042: Ad
d
a testcase
w
here gi
t
del
e
tes an
u
ntracked
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-03-02
Elijah Newren
merge
-
r
e
cursive: When we detect we can skip an
update
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-03-02
E
lijah Newren
t6022:
New tes
t
c
h
eck
i
n
g
f
or unn
e
ce
s
sary updates of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-03-02
Elijah New
r
e
n
t
6
022:
N
ew test checking for u
n
necessary updates of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-02-03
El
i
jah Newren
A
d
d
testcases showing how pathspecs are handled with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-02-03
Elijah Newren
Make rev-list --
o
bjects
w
o
rk to
g
ether
with pathspecs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newren
Introduce sane_unset and us
e
it to ensure proper &
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
E
lijah Newren
t
7
8
00 (difftool): add missin
g
&&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah
N
ewren
t7
6
01
(mer
g
e-pu
l
l-config): ad
d
m
is
s
ing
&
&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah
N
ew
r
en
t7
0
01 (mv): ad
d
mi
s
sin
g
&&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
E
l
ijah Newren
t6016 (rev-li
s
t-graph-simp
l
ify-history):
a
d
d missin
g
&&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elija
h
Ne
w
ren
t560
2
(clone-remote-e
x
e
c
): add missing &&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
E
l
i
j
ah
Newren
t4026 (color):
remov
e
unneeded and unchained co
m
mand
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newren
t4019 (diff-w
s
error): add
lots of miss
i
ng &&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elija
h
Newren
t4202 (log): Replace '<git-c
o
mma
n
d> || :' w
i
th t
e
st
_
might_
f
ail
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newren
t4002 (diff-b
a
sic):
u
se
te
s
t_might_fail for
commands
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newren
t
1
00[12] (r
e
ad-tree
-
m-2
w
ay, read_tree_m_u_2way):
add
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elij
a
h
New
r
en
t
4
017 (diff
-
r
etval):
r
ep
l
a
c
e manual exit code ch
e
ck
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-04
Elijah Newr
e
n
t3020 (
l
s-files-
e
rror
-
unma
t
ch): r
e
move stray '1'
f
rom
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
lij
a
h Newren
me
r
ge-recursive: Re
m
ove redu
n
dant path cle
a
r
i
ng for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
El
i
j
a
h
Ne
w
ren
merge
-
recursive: Make ro
o
m for directorie
s
in D/
F
conflicts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
h
a
ndle_delete_
m
o
d
i
f
y(): Ch
e
ck whe
t
her D/F conflicts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah
Newren
merge_content():
C
heck whe
t
her D
/
F conflicts are still
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Eli
j
ah Ne
w
ren
co
n
flic
t
_renam
e
_rename_1to2(): Fix
che
c
ks for presence
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
c
o
n
fli
c
t_r
e
name_d
e
l
e
te():
Chec
k
w
h
e
t
h
e
r D/
F
c
o
nflicts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newr
e
n
merge-recurs
i
ve: Dela
y
mod
i
fy/delete conflicts if D
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah
New
r
en
merge-r
e
cursive: D
e
lay
c
o
n
tent
m
erging
f
o
r
renames
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
merge-recursive: Del
a
y handling of rename/delete conf
l
ic
t
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
m
e
rge-r
e
cursive
:
Move ha
n
d
l
ing of double rename of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
l
ijah Newre
n
merge-rec
u
rsive:
Move handling
of double
r
enam
e
of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elij
a
h Newren
m
e
r
g
e-recursive: Avoid doub
l
y merging rename/add
c
onflict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
l
ijah
N
ew
r
e
n
merge-recursive: Upd
a
te merge_content() ca
l
l signature
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
El
i
j
ah Newren
merge-
r
ecur
s
ive
:
Upd
a
te confl
i
ct_rename_renam
e
_
1
t
o2
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah
N
ewren
merge-recursiv
e
: Structure process_d
f
_
entry() to hand
l
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
merge-recursive: Have proce
s
s_en
t
ry(
)
skip D/F or r
e
name
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elij
a
h Newren
merg
e
-recursive: New function to assist resolving ren
a
mes
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elij
a
h
New
r
en
merge-recursive:
N
ew data
structures
f
or
d
ef
e
r
ring
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elija
h
N
e
wren
merge-
r
ecurs
i
ve: Move proces
s
_en
t
ry's content mergin
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elij
a
h Ne
w
ren
merge
-
recu
r
sive: Mo
v
e delete/modify hand
l
ing into dedicated
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah
N
e
wren
m
erge-re
c
urs
i
v
e: Mov
e
rename/del
e
te
h
a
ndling int
o
dedicated
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
l
ijah Newren
merge-recursive:
Nu
k
e rename/direct
o
ry conflict detection
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
l
i
j
ah N
e
wren
merge-recu
r
sive:
R
ename conflict_
r
ename_rename*() for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elija
h
Newren
merge-recursi
v
e: Small code
c
l
arificat
i
on --
v
a
riable
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
El
i
jah Newr
e
n
t
6036: Add
t
estcase for un
d
etected
c
on
f
lict
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elija
h
Newren
t6036
:
Add a s
e
cond
t
estc
a
se similar
to the first but
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elija
h
Newren
t6036
:
Test i
n
d
ex an
d
w
o
r
ktree
s
tate,
n
ot
just that
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah
Newren
t6
0
20: Add a testcase for modify/d
e
l
e
te +
d
i
r
ect
o
ry
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elija
h
Newren
t602
0
: Moder
n
ize style a b
i
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newr
e
n
t60
2
2
: Add
tests f
o
r re
n
a
m
e/
r
ename combined wit
h
D
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
El
i
jah Newre
n
t60
2
2:
A
d
d
paire
d
rename+
D
/F
conflic
t
: (t
w
o/file,
o
ne
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
El
i
jah Newren
t
6022: Add tests with both rename source & dest
i
nvo
l
ved
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
l
ijah
N
ewren
t60
2
2: Add te
s
ts for reversin
g
order of merges when
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
El
i
jah Newren
t
60
2
2:
A
dd test combin
a
tions of {
c
o
n
tent confli
c
t?
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
El
i
jah
Newr
e
n
t6032: Add a test
c
hecking for excessive output f
r
om
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-10
Elijah Newren
m
erge-recursive:
D
/F confl
i
cts w
h
e
r
e was_a
_
d
i
r
/
f
ile
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-10
Elijah Newren
t
3509: Add
rename
+ D/F conflict testcas
e
that recur
s
iv
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-07
E
l
i
j
ah Newren
revert: Fix trivia
l
comment style issue
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-07
Elijah Newren
cache
_
tree_free:
Fix small memory leak
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-26
El
i
jah Ne
w
ren
dif
f
_tree(): Skip skip
_
un
i
nteresti
n
g()
w
hen a
l
l remaining
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-26
Elijah
N
e
wre
n
t
ree_entry_int
e
restin
g
(): Make
r
et
u
rn value more spe
c
ific
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-26
Elijah
Newren
t
r
ee-walk: Correct bi
t
rott
e
d
comment
a
bout tree_en
t
ry()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-26
Elijah Newren
Documen
t
pr
e
-
condition fo
r
tree_entry_inte
r
esting
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-25
Elijah Newren
tree-walk:
C
orrect b
i
t
r
otted commen
t
about tree_entr
y
(
)
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-20
Elijah Newren
merg
e
-recursi
v
e:
Avoid excessiv
e
output for
and
r
e
processing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Elijah New
r
en
merge-recursive: Fix
mul
t
iple
file rename
across D
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
E
l
i
j
a
h
New
r
en
t603
1
: Add a test
c
ase
covering m
u
ltiple
r
e
name
s
across
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Eli
j
ah Newren
merg
e
-recursive
:
F
i
x t
y
p
o
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-13
Elijah
N
ewren
M
a
rk tests t
h
at us
e
symli
n
k
s
as needing SYMLINKS
p
rerequisit
e
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-13
Elijah New
r
en
pull --rebase: Avoid sp
u
rio
u
s conflicts
a
nd reapp
l
yin
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-13
E
l
ijah Newren
t
5520-pull:
Add te
s
tcases showing spurious conflicts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-02
El
i
jah Newren
u
p
load-pack:
I
mprove error m
e
ssage when bad ref requested
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
E
l
ijah Newren
fast-export:
Add a --
f
ul
l
-tr
e
e
option
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
El
i
jah Newren
fa
s
t-expo
r
t: Fix dropping o
f
files wi
t
h --i
m
port
-
marks
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-09
Elij
a
h Newren
fast-import: Imp
r
o
v
e r
o
bust
n
e
s
s w
h
en D->F ch
a
n
ges
pr
o
vi
d
ed
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-09
Elijah Newren
fast-export:
Fix output
ord
e
r of D/F changes
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-09
Elijah Newre
n
mer
g
e
_
recursive: Fi
x
ren
a
mes across
pat
h
s
b
elow D/F
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-09
Elijah Newren
merge
-
recursive: Fix D/F conflicts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-09
Elijah
N
ewren
Add a
d
d
itional t
e
stcases
for D/F
conflicts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-06-27
Elija
h
N
e
wren
f
ast-export: Doc
u
men
t
t
h
e fac
t
that git-rev-list a
r
gumen
t
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-06-27
Elijah Newren
Add new fast-expo
r
t testcas
e
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-06-27
Elij
a
h
Newren
fas
t
-export: Add a --tag-of-filte
r
ed-ob
j
ect option
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-06-27
E
lijah Newren
fast-exp
o
rt: D
o
parent rewri
t
i
n
g to a
v
oid dropping
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-06-27
Eli
j
ah Newren
fast
-
export: Make sure we
s
how actua
l
r
e
f
n
ames in
s
te
a
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-06-27
Elijah
Newren
fast-export: Omi
t
tags that tag trees
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-06-27
Elijah Ne
w
re
n
fa
s
t-export:
Set revs
.
topo_or
d
e
r
befo
r
e
ca
l
li
n
g setup_rev
i
sio
n
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-05-16
Eli
j
ah
N
ewren
g
i
tk: Make more opti
o
ns easily acc
e
s
s
ible from Edit
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-03-26
Elijah
Ne
w
ren
fast-export: Avoi
d
dropping files from
c
o
mmits
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-03-25
Elijah
N
ewren
Correct missing SP cha
r
acters in
grammar comm
e
n
t a
t
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-03-25
Elijah New
r
en
git-filter-bran
c
h: av
o
id co
l
lis
i
ons with
var
i
ables
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-02-28
Elijah
N
ewren
Ensure proper s
e
tup of git_dir
f
o
r git
-
hash-obj
e
c
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-02-12
Elijah
New
r
e
n
fa
s
t-expo
r
t: ensure we tra
v
erse commits i
n
to
p
o
l
o
gical
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree