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
receive.fsck.<msg-id> tests: remove dead code
2018-06-28
Eli
j
ah Newr
e
n
t5407: fix test to cover intended
a
rguments
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-28
Elijah Newr
e
n
apply: fix gra
m
mar error in comment
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah New
r
en
gi
t
-rebase--
m
erge
:
modernize "g
i
t-$cm
d
" to
"
git $cmd"
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
E
l
i
j
ah Newr
e
n
Fix use of s
t
r
a
tegy opt
i
ons with in
t
eractive rebases
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah
N
ewren
t3418:
add testcase s
h
o
w
ing proble
m
s w
i
th rebase
-i
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah Newren
g
it-rebase: make --allow-empty-messa
g
e the default
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah Newren
t3
4
01: add directory rename testca
s
es for rebase and am
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
E
l
i
jah Newren
git-rebase
.
txt:
d
o
cument behav
i
oral diff
e
rences betwee
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah
Newren
directory-rename-detection
.
txt:
t
echnical docs
o
n abilities
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
E
li
j
ah New
r
e
n
git-rebase
.
txt:
address c
o
nfusion
b
e
t
wee
n
--no-ff vs
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elij
a
h N
e
wren
git-r
e
base:
error ou
t
when inco
m
patibl
e
options pa
s
sed
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elija
h
N
ewren
t3
4
2
2: n
e
w
t
estcases f
o
r
checki
n
g
when incomp
a
tible
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-26
Elijah Newren
git-rebase
.
sh:
u
pdat
e
help mes
s
ages
a
bi
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-26
E
l
i
ja
h
Newren
git-
r
e
b
ase
.
tx
t
:
do
c
u
m
en
t
incompati
b
le options
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-13
Elijah Ne
w
ren
Rel
N
o
tes 2
.
1
8: cla
r
i
f
y where directory ren
a
me detec
t
ion
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
Elijah Newren
m
e
rge-rec
u
r
sive: add pointe
r
about und
u
ly
c
omple
x
looking
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
Elijah N
e
wren
merge-recu
r
sive: rename
co
n
flict_rena
m
e_*()
fa
m
ily
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
Elijah Ne
w
ren
m
e
rg
e
-recursive
:
clarify
t
he rename_dir/RENAME_DIR
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
Elijah Newr
e
n
merge-rec
u
rsi
v
e:
align lab
e
l
s with
th
e
ir r
e
spective
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
E
l
ijah Newre
n
merge-recursive: fix numer
o
us arg
u
m
e
nt alig
n
ment issues
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
Elijah N
e
wren
merge-recu
r
sive: fix miscellaneou
s
gra
m
mar
erro
r
in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-01
El
i
jah
Newren
RelNotes: remove dupli
c
ate release note
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Eli
j
ah
N
ew
r
en
t60
3
6: pref
e
r
test_when_finished to manual c
l
e
anup
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
E
l
ija
h
Newren
t6036, t6042: prefer test_cmp
to sequences of tes
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
E
l
i
jah New
r
en
t
6036,
t60
4
2: pref
e
r test_path
_
is_file, test_path_is_missin
g
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Elijah Newren
t6036, t6042: use test_li
n
e_count
instead o
f
wc -l
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Elija
h
Newren
t
6
03
6
,
t
6
042: u
s
e test_create_repo
to
k
e
ep t
e
sts
i
ndependent
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-25
E
l
ijah Newr
e
n
rev-
p
arse: ch
e
ck looku
p
'
e
d commit refer
e
nces for NU
L
L
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-20
Elijah N
e
wren
merge-r
e
cursive:
p
rovide pair of `unpack_trees_{start
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
l
i
jah Newr
e
n
merge-recursive: fix
check
f
o
r skipability of working
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elij
a
h N
e
wren
merge
-
recursive:
m
ake "Auto-mergin
g
" comment show for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-re
c
ursi
v
e: fix rema
i
nder of
was_dirty()
t
o use
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
lij
a
h Newren
merge-recur
s
ive:
f
ix was_tracke
d
()
to quit lying with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
t6046:
t
estcases checking wh
e
t
her u
p
dates can be
s
kippe
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
m
er
g
e
-
rec
u
rsive: avoi
d
tr
i
ggering add_cache
i
nfo err
o
r
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elija
h
Newren
merge-recursive: move more is_d
i
rty ha
n
dling t
o
merg
e
_content
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
El
i
j
ah Newren
mer
g
e-re
c
ursiv
e
:
improve
add_
c
acheinfo error h
a
ndling
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-recurs
i
ve:
a
void spu
r
ious rename/rena
m
e con
f
li
c
t
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
El
i
jah N
e
wre
n
d
irec
t
ory rename detection: new test
c
ases showcasing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah
Newren
merge-recursive: fix
re
m
ain
i
ng director
y
rename + dirty
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elija
h
N
e
w
r
en
merge-r
e
c
u
r
sive:
f
ix overw
r
iti
n
g dirty files involved
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elij
a
h
Newren
merge-recur
s
ive: av
o
id clobbering u
n
tracke
d
f
i
l
e
s
with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah New
r
en
merge-recursive: apply
nece
s
sary modifications for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-recurs
i
ve: wh
e
n com
p
aring f
i
les, don't i
n
clude
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah
New
r
en
me
r
ge-
r
ec
u
rsive: check for
f
ile
level con
f
licts then
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah
Newren
merge-re
c
ursive:
a
dd computation of co
l
lisio
n
s due
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elija
h
Newr
e
n
merge-recursive
:
ch
e
ck for
d
irecto
r
y level conflicts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newre
n
merge-recursive: a
d
d
get_directory_re
n
a
mes()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-02
Elij
a
h Newren
unpack_tree
s
: fix
b
reakage w
h
en o
-
>src_index !=
o-
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-25
Elijah Newren
M
a
ke running git under other
d
e
bugger-like programs
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
m
erge-recursive: make a helper function for cleanup
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
E
lijah Newren
merge-re
c
ur
s
ive
:
s
plit out code for dete
r
mining diff_filepa
i
rs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elija
h
N
e
w
ren
merge-
r
e
cu
r
sive: m
a
ke !
o
->detec
t
_rename codepath more
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
merge-re
c
u
r
sive: fix leaks of allocated renames
a
nd
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
merge-re
c
ursive: introduce new f
u
ncti
o
ns to han
d
l
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
m
e
rg
e
-re
c
ursiv
e
: move the get_
r
enames() functi
o
n
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newre
n
directory rename detection: test
s
for handl
i
ng overwriting
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Ne
w
ren
dire
c
to
r
y rename
detection: tests for handling over
w
r
iting
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elija
h
Newren
di
r
ectory rename detection: m
i
scellaneous
testca
s
es
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Ne
w
ren
dir
e
ctory re
n
ame detection: tes
t
cases
expl
o
ring
possibly
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elija
h
Newr
e
n
directory rename
d
etection: more invol
v
ed edge/corner
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
E
l
ijah Newren
director
y
rename
d
etection: testcases checking wh
i
ch
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
E
l
ijah New
r
en
directory
r
e
n
ame dete
c
t
ion
:
files/director
i
es in the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah New
r
en
dire
c
tory re
n
a
me
d
etec
t
ion: partially renam
e
d dire
c
to
r
y
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah N
e
wren
dire
c
tory
rename de
t
ection: testca
s
es to
a
v
o
i
d
taking
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elija
h
Ne
w
r
en
di
r
e
ctory rename
d
et
e
c
t
ion: direc
t
or
y
s
p
litting testca
s
es
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Eli
j
ah Newre
n
di
r
ecto
r
y rename
d
etection: basic testcases
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-09
Elijah Newren
D
ocumenta
t
ion: normalize spelling of 'normali
s
e
d
'
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-09
Elijah Newr
e
n
Documentati
o
n: fix
s
everal
one-character-off
spel
l
i
n
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elij
a
h
Newren
merg
e
-re
c
ursive: ensure we wr
i
t
e
upda
t
e
s
fo
r
directory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Eli
j
ah Newr
e
n
merge-recursiv
e
: avoid
s
purious
r
ename/
r
ename conflict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elijah Newren
directory rena
m
e de
t
ecti
o
n
: new te
s
tcases showcasing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elijah Newren
merge-recursive: fix remaining director
y
rename + dirty
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elijah New
r
en
merge-
r
ecursiv
e
: fix overwriting d
i
rty files involved
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elijah Newren
merge-rec
u
rsive: a
v
oid clob
b
ering u
n
tracked f
i
les w
i
th
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elijah Newren
merge-
r
ecursive: ap
p
l
y
necessary
modif
i
c
at
i
ons for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah
N
ewren
merge-
r
e
c
ursive: when co
m
par
i
ng files, don't
i
nc
l
ud
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
me
r
ge-recursive: check for
f
i
l
e
level conf
l
icts then
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
merge
-
recursive: add computation of coll
i
sions due
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elij
a
h
N
ewr
e
n
merge
-
recursive: check for dire
c
tory level conflicts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
merge-recursive: add
g
et_directory_rena
m
es
(
)
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
m
erge-recursive:
m
a
ke a helper function for clea
n
up
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah
N
ewren
merge-recursive: sp
l
i
t out code for determining diff_f
i
lepairs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Ne
w
r
e
n
me
r
ge-recursive: m
a
ke !o
-
>det
e
ct_rename codep
a
th more
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Eli
j
ah Newre
n
merge-recu
r
sive: fix
lea
k
s
o
f
allocated rena
m
es and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
merge-recu
r
sive: intro
d
uce new
functions to ha
n
dle
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
El
i
jah
N
ewre
n
me
r
ge-recursive: move
the
get_r
e
names()
f
unct
i
on
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah New
r
en
d
ir
e
ctory rename detection:
t
ests for handlin
g
overwritin
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah N
e
wren
di
r
ectory rename
de
t
ect
i
o
n
: tests f
o
r ha
n
d
l
in
g
ov
e
rwriting
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah New
r
en
directory rename detec
t
ion: misce
l
lan
e
ous testcases
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
directo
r
y rename detec
t
ion: te
s
t
cases e
x
pl
o
ring possibly
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah
Newr
e
n
d
i
rectory rename detection:
more in
v
olved edge/cor
n
er
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
El
i
jah
N
ew
r
en
d
i
rect
o
ry rename
d
e
tectio
n
: testcas
e
s checking
whic
h
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elij
a
h Newren
direct
o
r
y rena
m
e
detection: files
/
directories in t
h
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elij
a
h Newre
n
directory re
n
ame
d
e
tection: partially ren
a
med
d
ire
c
tory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
E
l
i
j
ah Newren
directo
r
y rename
detection
:
testcases to
a
vo
i
d taking
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
d
i
re
c
tory renam
e
detection
:
directory splitting testca
s
es
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah
Newren
directory renam
e
detection
:
ba
s
ic
testcases
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-01-19
Elijah Newren
merge-recursive:
a
dd explanation fo
r
s
r
c_entr
y
a
n
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-01-19
Elijah Newren
merge
-
recursive: fix logic
o
r
dering issue
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next