repo.or.cz
/
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 'uk/checkout-ambiguous-ref'
2011-02-03
Elijah N
e
wren
A
dd
t
est
c
ases sh
o
wing ho
w
pathsp
e
c
s
are handled with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-02-03
Elijah Newren
M
ake re
v
-li
s
t --objects work together with pathsp
e
cs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah
Ne
w
ren
I
ntroduce sane_unset and use
i
t to en
s
u
r
e prope
r
&
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newren
t7800
(
dif
f
tool): add missing &&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newren
t7601 (mer
g
e-pull-con
f
ig): add m
i
ssing
&
&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
E
l
ijah New
r
en
t7001 (mv): add missing &&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elij
a
h Newren
t60
1
6 (rev-
l
ist-
g
raph-simplify-history): ad
d
missing
&&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah
N
ew
r
en
t560
2
(c
l
one-remote-exec): add miss
i
n
g
&&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
E
lijah Newren
t4
0
26 (color): rem
o
ve
unneeded and uncha
i
ned
c
ommand
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elij
a
h
Newren
t4
0
1
9
(diff-wserror):
a
d
d lots o
f
missing &&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
El
i
j
ah Newren
t4202 (log): Replace '<git-
c
ommand> || :' with t
e
st_might_fail
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elija
h
Newren
t
4
002 (diff
-
basic): use
te
s
t_mi
g
h
t
_fail
f
or commands
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah New
r
en
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
Elijah Newren
t4
0
17
(diff-retval): repla
c
e manual exit
c
ode check
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-04
Elijah Newren
t
3020 (ls-files-e
r
ror-unma
t
ch
)
:
r
e
mo
v
e stray '1' from
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
El
i
j
a
h Newre
n
merge-re
c
u
r
sive: Re
m
ove redun
d
ant pat
h
c
l
e
aring for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
l
ijah
N
ewren
merge-recursive: Make
r
o
om for directorie
s
in D/F confli
c
ts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newre
n
handle_delete_
m
o
dify(): C
h
eck whether D/F conflicts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Ne
w
ren
merge_content(
)
: Check whether
D/F conflicts a
r
e still
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
lijah Newren
conf
l
ict_rename_r
e
name_1to2():
Fix
c
hecks fo
r
presence
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
l
ijah Newren
conflict_renam
e
_delete(
)
: Ch
e
c
k
whether
D
/
F conflic
t
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
merge-recur
s
ive: Delay
m
odify/delete confl
i
cts if D
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
merge-rec
u
rsive: D
e
lay conte
n
t merging for rena
m
e
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah N
e
wren
merge-recursi
v
e: Delay ha
n
dling of rename/delete conflicts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Ne
w
ren
merge
-
rec
u
rsive:
M
ove handling of double rename of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Eli
j
ah
N
ewre
n
merge-recursive: M
o
ve handli
n
g of double rename of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah
Newren
merge
-
recurs
i
ve:
Avoi
d
doubly merging rename/ad
d
conflic
t
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Eli
j
ah Newren
me
r
ge-recursive:
U
pdate merge_conte
n
t(
)
call sig
n
ature
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
m
erge-recursiv
e
: U
p
date con
f
lict
_
re
n
ame_
r
ename_1to2
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
l
i
ja
h
Newren
merge-re
c
ursive: Structure pr
o
ces
s
_df_entry() to handle
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
l
ijah Newren
merge-recursive:
Have process_entry() skip D/F or rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
merge-recursi
v
e: New
f
unction to as
s
ist
r
esolving ren
a
mes
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
merg
e
-r
e
cu
r
sive: N
e
w data str
u
ctures for def
e
r
r
ing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Eli
j
ah
N
ewren
m
e
rge-recursive: Move process
_
entry's
c
ontent
merging
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
lijah Newren
merge-
r
ecurs
i
ve: Move
d
elete/mo
d
if
y
handlin
g
into
dedicated
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elij
a
h Newren
m
er
g
e-recursive: Mo
v
e ren
a
me/de
l
ete handling in
t
o
d
edicated
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
m
e
rge-rec
u
rsive
:
Nuke rename/di
r
ectory
conflict detection
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah
N
ewre
n
m
e
rge-r
e
c
u
r
sive: Rename conflict_
r
ename_rename*
(
) for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
m
e
rge-recursive: Small
code clarificat
i
on
-- variable
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
t6036: Add te
s
tcase for undetected confli
c
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
t6036: Add a second tes
t
case similar to t
h
e
first but
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah
Newr
e
n
t6036: Test i
n
dex and worktree s
t
ate, not just that
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah New
r
e
n
t6
0
20:
A
dd
a t
e
stca
s
e for mod
i
f
y/
d
elete + di
r
e
c
tory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
t6020
:
Mode
r
nize style a bit
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
El
i
jah Newren
t60
2
2: Add tests
for rename/renam
e
combined w
i
th D
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
t60
2
2:
A
dd p
a
ired rename+
D
/F c
o
n
f
lict: (two/file, on
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
l
ijah Newren
t6022: Add test
s
with both rename source & dest inv
o
lv
e
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
t6022:
Add t
e
sts for reversing
order of me
r
ges when
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
lij
a
h
Newren
t6022: Add
test
c
ombinations of
{cont
e
nt confli
c
t?
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
t
6
032: Add a te
s
t checking
for excessive output from
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-10
Elijah N
e
wr
e
n
merge-r
e
cursive: D/F con
f
l
i
cts wh
e
re was_
a
_
dir
/
f
ile
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-10
Elijah Newre
n
t350
9
: Add
r
ename +
D
/
F conflict testca
s
e that
recursive
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-07
El
i
ja
h
Newren
rever
t
: Fix tr
i
v
i
al commen
t
s
t
yle issu
e
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-07
Elijah Newren
c
ache
_
t
r
ee_free: Fix smal
l
memory leak
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-26
Elijah Ne
w
ren
diff_tre
e
(): Skip sk
i
p_uninteresting()
w
hen
all remaining
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-26
Elij
a
h New
r
en
tree_
e
ntry_inte
r
estin
g
():
Make
r
e
t
urn value more
sp
e
ci
f
ic
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-26
El
i
jah Newren
t
r
ee-wal
k
:
Corre
c
t
bitrotted
co
m
ment about
tree_entry()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-26
Elijah Newren
Document pre-
c
ondi
t
i
o
n for tree_en
t
ry_interes
t
ing
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-25
Elijah New
r
en
t
r
ee-walk: Correct bitrott
e
d
comment about
t
ree_entry()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-20
Elijah N
e
wren
merge-recursive:
Avo
i
d excessive output
f
or and repro
c
essing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
E
l
ijah
N
ewren
m
e
rge-recursive: Fi
x
multiple
f
ile renam
e
a
c
r
o
ss D
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Elijah
N
ewr
e
n
t60
3
1: Add a
t
e
s
tcase covering multipl
e
renames across
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Elij
a
h N
e
wren
merge-recursive
:
Fix
t
ypo
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-13
Elijah Newren
M
a
r
k
tests
t
hat use
s
ym
l
inks as need
i
ng
S
YML
I
NKS prerequ
i
site
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-13
Eli
j
ah Newren
pull --r
e
ba
s
e: Avoid spur
i
ous conflicts
and reapplying
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-13
Elija
h
Newren
t
5
520-
p
ull: Add testcas
e
s
showing spurious conflicts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-02
Eli
j
ah Newren
u
p
load-pack: Impro
v
e error message when
bad
r
ef requested
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
E
lijah N
e
wren
f
as
t
-export: Add a --full-tree
option
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
Elijah Newren
fas
t
-export: Fix dropp
i
n
g of f
i
les with --import-marks
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-09
Elijah New
r
e
n
fast-import:
Improve rob
u
s
tnes
s
when D-
>
F changes provided
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-09
El
i
ja
h
Newren
fast-e
x
port: Fix out
p
u
t
order of D/F ch
a
n
g
es
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-09
Elijah
New
r
en
merg
e
_recursive: Fi
x
renames ac
r
oss path
s
below
D
/F
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-09
Elij
a
h
N
e
wren
merge-recursive:
Fix D/F conflicts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-09
Elijah Newren
A
d
d additional testcas
e
s fo
r
D
/
F conf
l
icts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-06-27
Elija
h
Newren
f
a
st-export: Do
c
ument the fact th
a
t
git-rev-list argume
n
t
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-06-27
El
i
jah N
e
wren
Add new fast
-
export testcases
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-06-27
Elij
a
h
Newren
fast-export: Add a --tag-of-filtered-ob
j
e
c
t option
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-06-27
Elijah New
r
e
n
fast-e
x
port:
Do parent rewrit
i
ng to av
o
id droppin
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-06-27
Elijah Ne
w
ren
fast
-
export: Mak
e
sure we show actual ref names
i
nstea
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-06-27
E
lijah Newren
f
ast-expo
r
t
:
O
m
it tags that tag
t
rees
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-06-27
Elijah New
r
en
fast-export: Set revs
.
topo_order before ca
l
ling setup_revisions
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-05-16
Elijah Newren
gi
t
k: Ma
k
e more options e
a
sily
a
cces
s
ible f
r
om
Edi
t
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-03-26
E
l
ijah Newre
n
fast-
e
x
port: Avoid droppin
g
files from commits
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-03-25
E
lijah Ne
w
ren
Correct missi
n
g SP ch
a
racters in gramm
a
r c
o
mment a
t
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-03-25
Elijah N
e
w
r
en
git-filter
-
branch: avoid collisions with variables
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-02-28
Elija
h
New
r
e
n
Ens
u
re p
r
o
p
er setup
of git_dir for git-hash-o
b
ject
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-02-12
E
lija
h
Newren
f
ast
-
expo
r
t: ensure we trav
e
rs
e
co
m
mits in topological
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree