repo.or.cz
/
git
/
dkf.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Make rev-list --objects work together with pathspecs
2011-02-03
Elijah Newren
Make rev-list
-
-
object
s
wo
r
k together
w
ith paths
p
ecs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
E
lijah
Newren
Intr
o
duce sane_unset and u
s
e it to ensure proper &
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elij
a
h N
e
wren
t7800 (
d
if
f
tool): add missing &&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elij
a
h Newren
t
7601 (
m
erge-pull-config)
:
add missing &&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
El
i
jah Newren
t7001 (
m
v): add mis
s
ing &&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
E
lijah Newren
t6016 (r
e
v
-list-g
r
ap
h
-simplify-history): add missing &&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newren
t5602
(
c
l
one-remote-
e
xec): add mis
s
ing
&
&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
E
lija
h
Newre
n
t4026 (color):
remove unneeded and unchained command
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Eli
j
ah Newren
t4019 (di
f
f-wser
r
o
r)
:
add lots
o
f
m
issing &&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah
Newren
t
4202 (log):
Repl
a
ce '
<
git-comma
n
d> ||
:
' w
i
th test_might_fail
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah N
e
wren
t4002 (dif
f
-ba
s
ic)
:
use test_mig
h
t_fail for command
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah
Newren
t100[1
2
] (read-tree
-
m
-
2way,
r
ea
d
_t
r
ee
_
m_u_2w
a
y
)
: add
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
El
i
jah
N
ewren
t4017 (diff-retval): rep
l
ace manu
a
l exit code c
h
e
c
k
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-04
E
l
ijah
N
ewren
t302
0
(ls-files-er
r
or-un
m
atch): remov
e
stray
'1' from
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newr
e
n
m
e
rge-recursive: Remove redund
a
n
t
pat
h
cl
e
ari
n
g f
o
r
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
El
i
jah Newren
me
r
ge
-
recursive: Make
room for directorie
s
in D/F conflicts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
l
ijah Newr
e
n
h
an
d
le_dele
t
e_modi
f
y(): Check wheth
e
r D/F conflic
t
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
merge_content(
)
: Che
c
k wh
e
ther
D/F
conf
l
ict
s
are still
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elij
a
h Newren
conflict_rename_r
e
na
m
e_1to
2
(): Fix checks for pre
s
ence
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
l
ijah Ne
w
ren
conflict_rename_d
e
l
e
te():
Check whether D/
F
conf
l
icts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
l
ijah Newren
merge-recu
r
sive: D
e
lay modify
/
delete co
n
flicts
if
D
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Eli
j
ah New
r
en
m
erge-recurs
i
ve: De
l
ay content merging for renames
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Eli
j
ah Newren
merge-r
e
cursiv
e
: Delay handl
i
ng of rename
/
d
e
lete confl
i
cts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
lijah
Newren
merge-re
c
ursive: Move handling of double rena
m
e of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
El
i
jah Newren
merge-recurs
i
ve: Move
han
d
ling of double
r
en
a
me o
f
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Eli
j
ah Newren
merge-recursiv
e
: Avo
i
d do
u
bly
merging r
e
name/add conflict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
merge-recursive: Update me
r
ge_content() call sig
n
ature
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
merge-recursive: U
p
date con
f
l
i
ct_re
n
a
me_
r
ena
m
e_1t
o
2
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
l
ijah
N
ew
r
en
merg
e
-rec
u
rs
i
ve: Structure proce
s
s
_df_en
t
ry() to handle
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah
New
r
en
merge-recursive: Have pro
c
ess_entry() skip
D
/
F or ren
a
me
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
El
i
ja
h
N
e
wren
mer
g
e-recursive
:
New function to assist resolv
i
ng re
n
ame
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newre
n
merge-recursiv
e
:
N
ew data structures for de
f
erring
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
El
i
jah
N
e
wr
e
n
merge-recursive: Mo
v
e process_entry's conte
n
t merging
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
merge-recursive:
M
o
ve delete/modify handling into
d
ed
i
cated
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newre
n
merge-r
e
cur
s
ive: M
o
v
e rename/d
e
l
e
te handling int
o
dedicated
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
lijah
Newren
merge-
r
ecursive: Nuk
e
r
e
n
a
m
e/dir
e
c
tory c
o
nflict
detection
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Ne
w
ren
merge-recursi
v
e: Rename co
n
f
lict_rename_rename*() for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Eli
j
ah
Newren
me
r
ge-recursi
v
e: Sma
l
l code clar
i
f
i
ca
t
ion -- variable
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah
Newren
t6036: Add testcase
f
or
unde
t
ected conflict
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
t6036: Add a s
e
co
n
d tes
t
case
s
imilar to the fi
r
st b
u
t
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
t6036: Test index and
w
orktre
e
state
,
not just
that
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
lijah Newren
t6020
:
Ad
d
a t
e
stcase f
o
r
modify/delete +
d
i
rectory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah N
e
w
r
en
t
6020
:
Modernize st
y
le a bit
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
t6022: Add tests for rename/r
e
name
c
ombi
n
ed
with D
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newre
n
t60
2
2: Add
p
aired renam
e
+D/
F
confl
i
ct:
(two/file, o
n
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elija
h
Newren
t6022: Add
tests with both rename sour
c
e & dest involved
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah N
e
wren
t6022: Add t
e
sts
fo
r
re
v
e
r
sing o
r
de
r
of m
e
rges
w
hen
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah N
e
wr
e
n
t6022: Add
test combinat
i
ons
of {conten
t
conflict?
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elij
a
h Newren
t
6032:
Ad
d
a t
e
st che
c
k
i
n
g
for excessiv
e
output from
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-10
Elijah Newren
merge-
r
ecur
s
ive: D/F conflict
s
wher
e
was_a
_
d
i
r/file
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-10
Elijah New
r
en
t3509:
A
dd ren
a
me
+ D/F conflict
tes
t
c
as
e
that recursive
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-07
Elijah Newren
rev
e
r
t
: Fix trivial c
o
mment style issue
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-07
Elijah New
r
e
n
cac
h
e_tree_free: Fix small me
m
o
r
y
leak
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-26
Elijah Newren
diff_tree(): Sk
i
p skip_uninterest
i
ng() w
h
en all
r
emaini
n
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-26
E
l
ijah
N
e
w
ren
tree_entry_inter
e
sting():
M
a
ke ret
u
rn value more spe
c
ific
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-26
Elijah
Ne
w
ren
tree-wa
l
k:
Correct bitro
t
ted comment ab
o
ut
tree_entry()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-26
Elijah N
e
wren
D
ocu
m
e
nt pre
-
con
d
ition
fo
r
tre
e
_en
t
ry_interesting
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-25
Elijah
N
ewren
tree-walk: Correct bitrot
t
e
d
c
o
mme
n
t a
b
out tree
_
entry()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-20
Elijah Ne
w
ren
merge-recurs
i
v
e
:
Avoid ex
c
essive
output
f
or and reproce
s
sing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
E
li
j
ah Newren
merge-recur
s
i
v
e: Fi
x
m
u
l
tiple
f
ile rename acros
s
D
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
E
l
ij
a
h Newren
t6
0
31: Add
a
t
e
stcase cover
i
ng
mu
l
tiple renames across
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Elijah Newren
me
r
ge-recursive: Fix typo
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-13
Elijah Newren
Mark tests that use symlinks
as needing SYMLINKS
prerequisite
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-13
E
l
ijah New
r
en
pull --rebase: Avoid sp
u
rious conflicts and reapplyi
n
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-13
Eli
j
a
h
Newren
t55
2
0-pull:
A
d
d
t
estcases sho
w
ing spurious co
n
flicts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-02
Elijah Newren
upload-pack: Improve er
r
or messag
e
when bad
r
ef requested
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
Elijah
N
e
wre
n
fast-export:
A
dd a --full-tree opti
o
n
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
Elijah Newren
fast-expor
t
: Fix dropping of files with --im
p
o
r
t-ma
r
ks
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-09
E
lija
h
New
r
en
fast-import: Im
p
rove robus
t
ness
w
h
en D->F chan
g
es
p
rovided
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-09
Elijah Newr
e
n
fast-export: Fix output order
o
f D/F
c
han
g
es
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-09
E
l
i
jah
N
ewre
n
merge_recursive: Fi
x
r
enames
across paths below D/F
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-09
Elijah Newren
merge-recurs
i
ve: Fix D/F conflicts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-09
Eli
j
ah Ne
w
ren
Add addi
t
iona
l
testcases for D/F conflicts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-06-27
Elijah Newren
fast-export:
Doc
u
m
e
n
t the fact t
h
at git-rev
-
list arguments
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-06-27
Elijah Newr
e
n
A
d
d new
f
ast-export testcases
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-06-27
Elij
a
h N
e
wren
fast-ex
p
ort: Add a --tag-o
f
-filtered-object option
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-06-27
Elijah Newren
fast-expo
r
t: Do parent re
w
riting to avoid dropping
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-06-27
E
l
ijah
N
ewren
fast-exp
o
rt: Make sure we show ac
t
ual ref names instead
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-06-27
Elijah N
e
wren
fast-
e
x
p
ort: Omit tags
t
hat tag
tree
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-06-27
E
l
ijah
Newren
fa
s
t-ex
p
ort
:
Set revs
.
topo
_
order
before calling setup_revisions
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-05-16
Elijah
Newren
gitk: Make more opti
o
ns
e
a
si
l
y acc
e
ssib
l
e from Edit
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-03-26
Elijah New
r
en
fast-export: Avoid dropping f
i
les f
r
o
m
commits
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-03-25
El
i
jah Ne
w
re
n
Correc
t
m
i
ssing SP characters in grammar comment a
t
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-03-25
El
i
jah Newren
git-filter-branch: av
o
id collisions with variables
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-02-28
E
l
ijah Newren
Ensu
r
e prope
r
se
t
u
p of git_dir fo
r
git-hash
-
object
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-02-12
Elijah
N
ewren
f
a
st-expor
t
:
ensure we traverse commits in topological
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree