repo.or.cz
/
git
/
gitster.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'es/chain-lint-more'
2018-08-30
Elij
a
h Newren
a
m
: a
v
oid directo
r
y rename detec
t
ion
when calling rec
u
rsive
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-30
E
lijah Newren
mer
g
e-re
c
ur
s
ive
:
add ability to t
u
r
n
off
di
r
ectory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-30
Elij
a
h Newren
t3401:
a
dd another direc
t
ory rename testcase
for
r
ebase
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
E
lijah Newren
Remove
forward declaration of an enum
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elij
a
h Newren
comp
a
t/pr
e
compose_utf8
.
h: u
s
e
m
o
r
e
common include guard
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elijah Ne
w
ren
urlmatch
.
h: f
i
x
i
n
clude guard
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elijah
Newren
Move definition o
f
e
nu
m
branch_track from cach
e
.
h to
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elijah New
r
en
alloc: ma
k
e allocate_alloc_
s
t
ate a
n
d clear_al
l
oc_state
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Eli
j
ah Newre
n
Add missing include
s
a
nd forw
a
rd de
c
larations
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elijah Newren
g
it-update-ind
e
x
.
txt: r
e
w
o
rd pos
s
ibly confusing example
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elijah Ne
w
ren
t
7406: avoid u
s
i
n
g
t
est_mus
t
_fail for commands other
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elijah Newren
t7406: pr
e
fe
r
t
e
st_*
h
elper fun
c
tions to te
s
t -[feds
]
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
E
l
i
j
ah
N
ewren
t7406:
avoid having git
command
s
upstream of a pipe
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
E
l
ijah Newren
t7406: sim
p
lify by
u
sing diff -
-
na
m
e
-only i
n
stead of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Eli
j
ah N
e
wren
t7406:
f
ix c
a
ll that was
failing fo
r
the
w
rong reason
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-06
E
lijah N
e
wren
t3031: u
p
dat
e
test descri
p
tion to mention desi
r
ed behavior
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-31
Elijah New
r
en
read
-
c
a
che: fix
dire
c
t
o
r
y
/
file conflict handling i
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-31
Elijah Newren
t101
5
:
demon
s
trate directory/fil
e
conflic
t
recover
y
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-27
E
l
ijah Newren
m
e
rge-recu
r
sive: preserve skip_worktr
e
e bit
when necessary
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elija
h
N
e
wren
t7405
:
verify
'
m
erge --abort'
w
orks after submodule
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah N
e
w
ren
t7405: add a di
r
ectory/submodule conflict
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newren
t7
4
05: add a
f
ile/su
b
module
c
o
nflict
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newren
merge: fix m
i
sleading p
r
e-merg
e
chec
k
documentati
o
n
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elija
h
Newren
merge
-
recursive: en
f
o
r
ce rule that inde
x
m
atches head
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
E
lijah
N
ewren
t6044:
a
dd mor
e
t
e
stcases with staged changes b
e
f
o
re
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newren
merge-recursive: fix assumpti
o
n tha
t
head tree being
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
E
l
ijah New
r
en
merge-
r
ecursive: make
sure when we say we abo
r
t that
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newren
t
6
044: add
a testcase for index matching
head, when
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
E
l
ijah Ne
w
ren
t6036: add a faile
d
con
f
lict detection case:
r
e
gular
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-06
E
l
ijah Newren
t6036:
add
lots
of detail f
o
r directory/file conflicts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
E
lijah Newre
n
t6042: add testcase
covering long chain
s
of
r
e
name
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
E
l
ijah Ne
w
ren
t6042: add
t
estcase cov
e
r
i
ng rename/rename(2to1)/delete
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newren
t6042: a
d
d t
e
stc
a
se covering ren
a
me
/
add/
d
elete c
o
nflict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newren
t6036: add a failed conflict detect
i
o
n case
w
ith conflicting
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah
N
e
wr
e
n
t6036: a
d
d a
fa
i
led confl
i
ct detection case wi
t
h submodule
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Ne
w
ren
t6036: add a
failed
conflic
t
detection case with submodule
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newren
t
6
036: add a fa
i
led conflict detectio
n
case
with symlink
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
E
lijah Newren
t603
6
:
a
dd a
f
a
iled conflict det
e
ction case with symlink
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah N
e
wr
e
n
t6044: verif
y
that merges expect
e
d to abo
r
t
a
c
tual
l
y
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newre
n
i
nd
e
x_has_
c
hanges()
:
avoid assum
i
ng operating
o
n the_index
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah
Newren
read
-
ca
c
he
.
c: move
i
ndex_has
_
changes() from merge
.
c
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-28
Elijah
New
r
e
n
t5407:
fix test t
o
cover
i
n
tended arguments
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-28
Elijah Newren
a
p
ply: fi
x
grammar
e
rror in comment
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah New
r
en
git-
r
eba
s
e--mer
g
e: modernize "git-$cmd" to "git $cmd
"
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah Newr
e
n
Fix use of st
r
ategy
o
ptions with interactive rebases
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
E
l
ijah N
e
wren
t3418: add testcase show
i
ng
problems
w
ith reba
s
e -i
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah Newren
git-rebase: m
a
k
e --allo
w
-empty-messag
e
t
he default
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah
N
ewr
e
n
t
3
401
:
a
d
d direc
t
or
y
rename
t
estc
a
ses
f
o
r rebase and am
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
E
l
ijah Newren
git-rebase
.
txt:
d
ocumen
t
b
e
havi
o
r
a
l differen
c
es between
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah Newren
dir
e
c
t
ory-rename-
d
ete
c
tion
.
txt
:
technical
d
ocs on
abilities
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
El
i
jah Newren
gi
t
-
rebase
.
txt: address conf
u
s
ion between --no-ff vs
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah Newren
gi
t
-rebase: erro
r
out when incom
p
atible op
t
io
n
s
p
a
ssed
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
E
lijah Newre
n
t3422: new testcases for checking when incompatible
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-26
E
l
i
jah Newr
e
n
git-reb
a
se
.
sh
:
upd
a
t
e
help messages a bit
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-26
Elij
a
h N
e
w
ren
git-rebase
.
txt: docume
n
t
incompatible options
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-13
E
li
j
ah Newren
RelNotes 2
.
18
:
clarify where d
i
rec
t
ory rename detec
t
ion
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
E
l
ijah Newr
e
n
merge-re
c
ursive:
a
dd pointer about unduly
complex look
i
ng
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
E
l
i
j
ah
Newren
merge-recur
s
ive: rename
c
o
nf
l
ict_re
n
am
e
_*() f
a
m
ily
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
Elijah Newren
mer
g
e
-
r
ecursive: clarify the rename_d
i
r/RENAME_DIR
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
Elijah Newren
merge-recursive: align labels wi
t
h their res
p
ective
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
Elijah New
r
en
merge-recursive: fix numerous argument align
m
ent issues
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
E
l
i
j
a
h Newren
merge-recursi
v
e:
f
ix mis
c
ellaneous gr
a
mmar er
r
or in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-01
E
l
ijah Newren
RelNotes: rem
o
ve duplica
t
e release note
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
E
lija
h
Newren
t6036: pre
f
e
r
tes
t
_
w
hen_f
i
nished to manu
a
l cleanu
p
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
El
i
ja
h
Newren
t60
3
6, t6042: prefer test_cmp to s
e
q
uences of test
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
E
lija
h
Newre
n
t6036, t6042: prefer tes
t
_path_is_file, test_path_is_missing
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Elijah Newren
t603
6
,
t
60
4
2: use
t
e
st_l
i
n
e_count instead
of wc -l
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Elijah New
r
e
n
t6036
,
t6042: use test
_
create_repo
t
o ke
e
p te
s
t
s in
d
ep
e
ndent
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-25
Elijah Newren
rev-pa
r
se: check look
u
p'
e
d commit reference
s
for
N
U
LL
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-20
Elijah Newren
merge-r
e
c
u
r
s
ive:
p
rovide pair o
f
`
unpack_trees_{star
t
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-recursive
:
fix check for skipability
o
f worki
n
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
mer
g
e-recursive: make "Auto-mergi
n
g
" co
m
ment show for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
l
ijah N
e
wren
merge-recurs
i
ve
:
fix rem
a
inder of was_dirty() to use
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elija
h
N
e
wren
merge-recu
r
sive: fix w
a
s_tracked() to quit
l
ying w
i
th
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah N
e
wren
t6046
:
testcases che
c
k
i
ng
w
het
h
er
u
pda
t
es
can be s
k
i
pp
e
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
mer
g
e-recursive: avoid trigg
e
ring add_
c
a
c
hein
f
o error
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah
N
ewre
n
merge-recursive: move
more is_dirty
handlin
g
to merge_c
o
n
t
ent
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah
N
ewren
m
erge-re
c
ur
s
iv
e
: improve add
_
c
a
cheinfo error
handling
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-r
e
cursive: av
o
i
d
spurious rename/rename conflict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah N
e
w
r
e
n
d
i
rectory ren
a
me
d
etection: new testcases sh
o
wcasing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Ne
w
ren
merg
e
-recursive: f
i
x r
e
m
a
ining directo
r
y re
n
a
m
e + dirty
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Eli
j
ah Newren
merge-recursi
v
e:
f
i
x
overwriting
d
irty files involved
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Eli
j
ah Newren
merge
-
re
c
ursive
:
avoid clobb
e
ring untracked file
s
with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah N
e
w
ren
merge-
r
ecurs
i
ve: a
p
p
ly necessar
y
modifications for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah
N
ewren
merge-rec
u
rsive: when compar
i
ng
files, don
'
t includ
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
El
i
jah
New
r
en
me
r
ge-
r
e
cur
s
ive: che
c
k
f
or
f
ile level con
f
l
icts then
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah
N
e
wren
mer
g
e-recursiv
e
: add comp
u
t
ation of collisions due
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
l
ija
h
N
ewren
merge-recursi
v
e: check for
d
i
rectory level conflicts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Eli
j
ah
Newren
merge
-
recurs
i
v
e: add
get_di
r
ectory_
r
en
a
m
es()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-02
Elijah Newren
unpack_trees:
fix
b
r
e
a
kage when o->src_index != o-
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-25
Elijah Newr
e
n
Ma
k
e r
u
nni
n
g git under other debugger-lik
e
programs
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah New
r
en
m
e
rge-re
c
u
r
s
ive: make
a help
e
r
function
f
or cleanu
p
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Ne
w
r
e
n
merge-recursive: sp
l
it out code
for de
t
erm
i
n
ing d
i
ff_f
i
lepair
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
E
lijah Ne
w
ren
merge-recu
r
sive: make !o
-
>
detect_re
n
ame c
o
depat
h
more
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Eli
j
ah Newren
merge-recur
s
ive:
f
ix lea
k
s
o
f
all
o
cated renames
and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah
Newren
m
e
rg
e
-
r
ec
u
rsive:
i
n
t
rodu
c
e new funct
i
ons
to handle
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
mer
g
e-recursive: move the get_rename
s
() fun
c
t
i
on
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newre
n
directory re
n
ame detection:
tests for handling o
v
erwriting
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
directory ren
a
me detectio
n
: tests for h
a
ndli
n
g overwriting
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
di
r
e
ctory rename
d
etection: miscellaneous testcase
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next