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
Git 2.19
2018-08-30
Elijah N
e
wre
n
a
m
: avoid directory r
e
name de
t
ection when c
a
lling recursiv
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-30
E
lijah Newren
me
r
ge-rec
u
rsive
:
add abilit
y
t
o
turn
off
d
i
re
c
tor
y
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-30
E
l
ija
h
New
r
e
n
t340
1
:
a
d
d
another directory
r
ename testcase for reb
a
se
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elijah Newren
Remove
f
orward de
c
laration o
f
an enum
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elijah Newren
compat/prec
o
mpose_
u
tf8
.
h: use
more common includ
e
guard
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elijah Newren
url
m
atch
.
h:
f
ix in
c
lude guard
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elijah Newren
Move d
e
finition
of enum branch_
t
r
a
ck fr
o
m cache
.
h
t
o
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elijah Newre
n
alloc: make allocate_alloc_state a
n
d clear_alloc
_
state
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
El
i
jah Newren
Add missing includ
e
s and forward declarations
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elijah Newren
g
it-
u
pd
a
te-index
.
tx
t
: rewo
r
d possibly conf
u
sing example
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elijah Newren
t7406:
avoid us
i
n
g test_must_
f
ail for comma
n
ds other
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elijah Newren
t7406: pref
e
r test_
*
he
l
per
funct
i
ons to test -[fed
s
]
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
El
i
jah Ne
w
ren
t7406: avoid having git comm
a
nds
u
p
stream of a
pipe
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
E
l
i
jah Ne
w
ren
t7406
:
sim
p
lif
y
by using diff --name-only instead o
f
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
E
lij
a
h
N
ewren
t
7406
:
fix call that was failing for
the
wrong reason
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-06
Elijah New
r
en
t3031:
u
pdate t
e
st descr
i
ptio
n
to menti
o
n desired b
e
havior
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-31
Elijah Newren
read-cache:
f
i
x directory/file conflict ha
n
dling in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-31
El
i
jah Newr
e
n
t
1015
:
demonstrate di
r
ectory/file conf
l
ict
recovery
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-27
El
i
jah
Newren
merge-re
c
urs
i
ve: preserve ski
p
_worktree bit when n
e
cessary
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah
Newren
t
7
4
05: verify
'merge --abort' work
s
after
s
ubmo
d
ule
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah New
r
en
t7405: add a directory/submo
d
ule
c
o
n
flict
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
El
i
jah Newr
e
n
t
7405
:
add a file/submodule co
n
flict
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
E
lijah Newren
m
e
rge
:
fix misleading pre-merg
e
check d
o
c
umenta
t
ion
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newr
e
n
merge-recursi
v
e: enforc
e
rule that index
matches head
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah
N
ewren
t
6
0
4
4:
add m
o
re testcases with staged changes before
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newren
merge-r
e
cursive: fix assumption
that
head
t
ree being
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newren
m
e
rge-recurs
i
ve:
m
a
k
e
s
u
re when we say we abort that
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elij
a
h Newren
t
6
044: add a
t
estcase for
in
d
ex matching head, when
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
E
lijah Newren
t6
0
36: add a fa
i
led
co
n
flict detection case: regular
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-06
E
li
j
a
h
Newre
n
t6036
:
add lots
o
f detail for director
y
/file
conflicts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Ne
w
re
n
t6042
:
a
dd testcas
e
coverin
g
l
o
ng c
h
ains
o
f rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah
N
ewre
n
t6042: a
d
d testcase coveri
n
g
rename
/
rename
(
2to1)/delete
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah New
r
en
t6042: add testcase cov
e
r
i
ng
r
ename/
a
dd/d
e
l
e
te con
f
lict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newren
t6036: add
a
failed confl
i
ct de
t
ection case
w
i
th conflict
i
ng
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newren
t603
6
:
add a failed conflict detection case
with submod
u
l
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
El
i
jah Newren
t6036: add a failed confl
i
ct detectio
n
case with submodule
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Ne
w
re
n
t6
0
3
6
:
add a fa
i
led conflict detection
case with s
y
mlink
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
E
l
ijah Newren
t
6036: add a failed conflict
d
ete
c
ti
o
n case
w
i
th symlink
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Eli
j
ah Newren
t6044: verif
y
t
hat merges expecte
d
t
o abort act
u
a
l
l
y
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newren
i
n
dex_has_chan
g
es(): avoid a
s
suming op
e
rating on the_index
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
E
lijah Newren
r
e
ad-cache
.
c: move i
n
dex_ha
s
_change
s
(
) from merge
.
c
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-28
Elijah N
e
wren
t5407: fix test to cover in
t
e
nded argume
n
ts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-28
Elijah Newren
apply: fix gramma
r
error i
n
comment
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
E
l
ijah Ne
w
ren
git-rebase--merge: moderni
z
e "g
i
t
-$cmd" to "git
$
cmd"
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah Newren
Fix use of str
a
tegy option
s
with interactive rebases
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah New
r
en
t3418: add tes
t
c
ase
sho
w
ing problems wi
t
h
r
ebase -i
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah N
e
wren
gi
t
-rebas
e
: make --allow-empty-message the default
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah Newr
e
n
t
3
4
01: ad
d
directo
r
y rename testcases for rebas
e
and am
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Eli
j
ah New
r
en
g
it-rebase
.
txt: d
o
cument behavioral d
i
f
ferences between
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah Newre
n
directory-rename-detection
.
txt: technical
d
ocs on abilities
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elij
a
h
Newren
git-rebase
.
txt: address confusion between --n
o
-
ff vs
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Eli
j
ah New
r
e
n
gi
t
-r
e
base:
e
rror out
when incompatible option
s
passed
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah Newr
e
n
t
3
4
2
2:
n
e
w
testcases fo
r
checking w
h
en incompatible
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-26
Elijah
N
ewren
gi
t
-
rebase
.
s
h: update
h
elp messages a bit
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-26
Elijah Newren
git-reb
a
s
e
.
txt: document inc
o
m
patible options
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-13
Elij
a
h Ne
w
r
e
n
RelNo
t
es 2
.
18
:
clarify
w
here directory ren
a
me detection
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
Elijah Newren
merge-recursi
v
e: add pointer about unduly
c
o
m
pl
e
x looki
n
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
Elijah Newren
mer
g
e-recursive: rename conflict_re
n
ame_
*
() family
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
Elijah Newren
me
r
ge-recursive: clarify the r
e
n
ame_d
i
r/RE
N
A
M
E_DIR
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
Elijah
N
e
w
re
n
merge-recu
r
sive:
align labels with their respe
c
tive
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
Elijah Newren
merge
-
recursive: fix n
u
merou
s
argument
a
lignment issue
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
El
i
jah
Newren
merge-rec
u
rsive:
f
i
x
mi
s
cellaneous grammar error in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-01
El
i
ja
h
Newren
RelNotes: remo
v
e
d
uplicate release note
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Elijah N
e
wren
t6
0
36: pre
f
er test_when_fin
i
shed to
m
anua
l
c
leanup
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Elijah Newren
t6
0
36, t6
0
4
2:
p
r
efer test_cmp to
s
e
quen
c
es of
t
est
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Eli
j
ah Newre
n
t6036, t
6
042: pr
e
fer t
e
st_path_is_file, test_path_
i
s_m
i
ss
i
n
g
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Elijah Newren
t
6
036, t6042: use te
s
t_line_count inste
a
d of wc -l
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Elijah Newren
t60
3
6, t6042: use t
e
st_creat
e
_
repo to
ke
e
p
tests independent
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-25
Elijah
N
e
wren
rev-
p
arse: check
lookup'ed c
o
mm
i
t refere
n
ces for NULL
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-20
Elijah Newren
me
r
ge-recursive:
provide pair of `unpack_trees_{sta
r
t
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
lijah
Newren
m
e
rg
e
-recurs
i
ve: fix check for sk
i
pabil
i
ty o
f
w
o
rking
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-recursive: make "Auto-merg
i
ng" comm
e
nt show for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
mer
g
e-recursive
:
fix rema
i
nder
o
f was_dirty
(
) to use
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newre
n
m
e
rge-recursive: f
i
x w
a
s_tracked() to quit
lyin
g
with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newre
n
t6046:
testc
a
ses
c
hecking
whether updates
c
an
b
e
s
ki
p
ped
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Eli
j
ah Newren
merge-recursive: avoid t
r
iggering add_ca
c
he
i
nfo
error
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
lijah Newren
m
erge-recur
s
iv
e
: mov
e
mo
r
e
i
s
_dirty handl
i
ng to
merge_c
o
n
tent
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-recursive
:
i
m
prove add_
c
ache
i
nfo error handling
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah
Ne
w
ren
merge-re
c
u
r
sive: avoid spuri
o
us rename/rename conflict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elija
h
N
ewren
dir
e
c
t
o
ry rename d
e
t
e
ct
i
on:
new
t
estcases
showcasing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-recursive: fi
x
r
e
maining d
i
r
e
c
t
o
ry rename + dirty
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-recursive: fix overwriting dirty files inv
o
lved
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elij
a
h
Newren
me
r
g
e-recursi
v
e
:
avoid clobberi
n
g u
n
trac
k
ed files
w
i
th
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-recursive: appl
y
n
ecessary modificat
i
o
ns for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newre
n
m
e
rg
e
-recursive: when comparing
fil
e
s, don't incl
u
de
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
li
j
ah N
e
wren
merge-re
c
ursive: check for file
l
evel conflic
t
s
t
h
en
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-recursive:
a
dd comp
u
tation
o
f coll
i
sions due
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
l
ijah Newren
m
er
g
e
-
re
c
ursive: check for directory
l
evel
confli
c
ts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
l
i
jah Newr
e
n
merge-rec
u
r
s
i
ve
:
add get_dir
e
ctory_renames()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-02
E
lijah Newren
u
npack_trees:
f
ix break
a
ge when o->
s
rc_in
d
ex != o-
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-25
Elijah
Newren
Make runnin
g
g
i
t under oth
e
r debug
g
e
r
-
like programs
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
merge-recursive: make
a helper func
t
ion
for cleanup
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newr
e
n
m
erge-recursive: split out
c
o
de for de
t
ermining diff_f
i
lepairs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah
New
r
en
m
e
rge-recursive: make !o->detect_rename codepath more
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah New
r
e
n
me
r
ge-recu
r
s
ive
:
fi
x
l
e
a
ks of a
l
lo
c
ated re
n
am
e
s
an
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah
Ne
w
r
e
n
merge-recursive: i
n
t
rod
u
c
e
n
e
w fu
n
ctio
n
s to handle
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah
N
ewren
m
erge-
r
ecu
r
sive: mov
e
th
e
get_r
e
nam
e
s() func
t
ion
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Eli
j
ah Newren
dire
c
tory rena
m
e
d
et
e
c
t
ion: tests for handling overw
r
iting
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah New
r
e
n
dire
c
to
r
y rename de
t
e
ction:
test
s
for handlin
g
o
v
erwr
i
tin
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
El
i
jah
N
ewre
n
director
y
ren
a
me detection:
miscellan
e
ous
t
e
stcases
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next