repo.or.cz
/
git
/
mjg.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
string-list: Add API to remove an item from an unsorted list
2011-08-14
E
lijah
Newren
merge-recu
r
siv
e
:
S
plit was_tracked()
out of would_
l
ose_untra
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah Newre
n
me
r
g
e
-recursive
:
S
a
ve D/
F
conflict fi
l
enames instead
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah N
e
wren
merge-recursive: Fix code ch
e
cking for
D
/F conflicts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ija
h
Newren
merge-recursiv
e
: Fi
x
sor
t
ing
o
rder an
d
direc
t
o
r
y change
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah N
e
w
ren
merge-recursive: Fix recursive c
a
se
with D/F
c
o
nflict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah N
e
wren
merge-re
c
ursive
:
Avoi
d
working directory chang
e
s
during
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah Ne
w
ren
merge-recursive
:
Rememb
e
r to free ge
n
erated
u
nique
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
ewren
merge-recursi
v
e: Consolidat
e
differen
t
update_stages
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h Newren
m
er
g
e-
r
ecurs
i
ve: Mark some di
f
f
_
filespec st
r
u
c
t
argu
m
ent
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recu
r
sive: C
o
r
rect a comment
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merg
e
-recur
s
iv
e
: Make BUG message more l
e
g
ible b
y
a
dding
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6022:
Ad
d
t
estc
a
se for me
r
ging a renamed
file with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6022: Ne
w
tests checking for unnecessary u
p
dates of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6022: Remove unne
c
ess
a
ry
unt
r
acked files to make tes
t
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
Newren
t6
0
36: cr
i
ss-cross
+
ren
a
me/rename(1to
2
)/ad
d
-sou
r
ce
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6036: cr
i
ss-cross w/ rename/ren
a
m
e
(1to2)/modify+rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6036: te
s
ts for criss
-
cross merges with various
d
irectory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newr
e
n
t6
0
36: criss-cros
s
with weird co
n
te
n
t can foo
l
git
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h N
e
wren
t6036: Add differently resolve
d
modif
y
/de
l
ete conflic
t
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah Newren
t6042:
A
dd fai
l
in
g
testca
s
es for rename/rename/add
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6042: Ensure rename/rename
c
on
f
l
i
c
ts l
e
av
e
in
d
e
x and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah Newren
t6042: Add tes
t
s f
o
r content issues with mod
i
fy/
r
ename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
Newren
t
6042:
A
dd a testcase where und
e
tected rename ca
u
ses
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
Newren
t6
0
42: Add a pair of cases w
h
ere unde
t
e
c
ted ren
a
me
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
ewr
e
n
t6042: Add failing testcase for re
n
a
me/modify/add-source
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6042:
Ad
d
a testcas
e
where
git del
e
tes
an untracked
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-02-03
Elijah Newren
Add testc
a
s
e
s showing how p
a
thspecs are
h
a
ndle
d
wi
t
h
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-02-03
Elijah Ne
w
ren
M
a
ke
r
ev-list
--objec
t
s work together with pathspe
c
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
El
i
j
a
h N
e
wren
Introduce sane_un
s
e
t
a
nd use
i
t
t
o ensu
r
e pr
o
pe
r
&
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newren
t7800 (
d
ifftool): add
m
i
ss
i
ng
&&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newren
t7601 (merge-pull-config): ad
d
m
issing &&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newren
t7001 (mv): add missi
n
g &&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Eli
j
ah N
e
wren
t6016
(rev-
l
ist-graph-s
i
mplify-history): add missi
n
g &&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
E
lijah Newren
t5602 (clone-remote-e
x
e
c):
a
d
d mis
s
ing &&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newren
t4026 (color): r
e
m
ove
u
nneeded and unchained command
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
E
l
i
jah Newre
n
t4019
(
d
iff
-
wserr
o
r): ad
d
lot
s
of missing &&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elij
a
h Newren
t4202 (log): Replace
'<git-command> || :' with t
e
st_might_
f
ail
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newren
t4
0
02 (diff-basic): use test_
m
ight_fail for
commands
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newren
t100[12] (r
e
ad-tree-
m
-
2way, read_tree_m_u_2
w
ay
)
: add
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah N
e
w
r
e
n
t4017
(
diff-retv
a
l
)
: re
p
la
c
e manual exit code
c
hec
k
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-04
Elijah
N
e
w
ren
t
3
020 (ls-f
i
les-
e
rror-unm
a
t
c
h): remove stray '1' from
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
El
i
jah Newren
m
er
g
e-re
c
ursive
:
Remove re
d
undant pa
t
h clearing for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah N
e
wren
me
r
g
e
-recursive: Make room for di
r
ec
t
o
ries in
D/F conflict
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
handle_
d
elete_modify(): Check
w
hether D/F c
o
nfl
i
ct
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
merg
e
_content(): Check
w
he
t
her D/
F
conflicts are
s
till
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah N
e
wre
n
conflict_rename_rename_1to2(
)
: Fix checks for presence
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
lijah
Newren
con
f
li
c
t_ren
a
me_delete():
Check
w
hether D/F conflicts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
li
j
ah New
r
e
n
merge-recursive: Delay modify/delete conflicts if
D
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
lijah Newren
m
erge-recursive: Delay content mergi
n
g for renames
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elij
a
h Newren
me
r
ge-re
c
ursive: Delay handling of rena
m
e
/
d
elete conflicts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
merge-recursive: Move handlin
g
of double rena
m
e of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newre
n
mer
g
e-re
c
ursiv
e
: Move handli
n
g of
double rename of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
merge-recursive: Av
o
id doubly
m
erging rename/add conflict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newre
n
merge-re
c
ursive: Upd
a
te
me
r
ge_content() call
s
ignat
u
re
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
me
r
ge-recur
s
ive: Update co
n
flict_r
e
name_rename_
1
to2
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Ne
w
re
n
merge-recursive: St
r
u
c
ture proc
e
ss_df_entr
y
(
)
to
h
andle
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
merg
e
-rec
u
rsive: Have p
r
oce
s
s_entry()
s
ki
p
D/F o
r
rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newr
e
n
merge-recursiv
e
:
New function to as
s
is
t
r
esolv
i
ng
re
n
ames
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah N
e
wren
merge-recursive: New data
s
truct
u
re
s
for deferring
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
lija
h
N
ewren
merge-recursive: M
o
v
e pr
o
cess_
e
n
try's con
t
ent
m
er
g
i
n
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah New
r
en
mer
g
e-recursive:
Move
delete
/
m
o
d
i
fy
h
andl
i
ng
i
nto dedica
t
ed
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah
Newren
merge-recu
r
sive: Mov
e
r
ename/de
l
e
t
e
handling into dedi
c
ated
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah
N
e
wren
merge-recursive: Nuke renam
e
/directo
r
y conflict d
e
tection
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
merge-rec
u
rsiv
e
: Ren
a
me c
o
nfli
c
t
_
rename_re
n
ame
*
(
) for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah
N
e
w
ren
merge-recursive
:
S
m
a
ll code clarifica
t
ion -- va
r
iable
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Eli
j
ah Newren
t6036: A
d
d testc
a
se
f
o
r
undetected
c
onflict
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
l
ijah
Newr
e
n
t6036: Add a second te
s
tcase si
m
i
l
a
r to the first but
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
t
6036: Test index and worktree state, not
just that
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah N
e
w
r
en
t6020:
A
d
d
a testcas
e
for mo
d
ify/delete +
dire
c
tory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
El
i
jah Newren
t
6020: Modern
i
ze sty
l
e a bit
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Ne
w
ren
t6022:
Add test
s
for ren
a
me/rena
m
e combi
n
ed with D
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
t6022:
Ad
d
paired re
n
ame+D/F conflict: (two/file,
one
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newr
e
n
t6022: Add te
s
ts wi
t
h
bo
t
h rename
source
& dest involve
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
t6022: Add tests for reversing
or
d
er of
merges when
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
l
i
jah Newren
t6022: A
d
d
t
est c
o
mbinations of {cont
e
nt confli
c
t?
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
lija
h
Ne
w
ren
t6032: Add a
test checking
f
o
r
e
xcessive o
u
tput from
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-10
Elija
h
Newren
m
er
g
e-recursive: D/F conflicts where was_a
_
dir/file
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-10
E
lijah N
e
wren
t3
5
09:
A
dd rena
m
e + D/F conflict testcase that
r
e
cursive
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-07
Eli
j
ah Newren
re
v
ert: F
i
x trivial co
m
men
t
style issue
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-07
Elijah New
r
en
cache_tree_free
:
Fix small
me
m
o
ry leak
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-26
Elijah Newren
dif
f
_
tree(): Skip
ski
p
_un
i
nteresting() w
h
en all remaini
n
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-26
Elijah New
r
e
n
tr
e
e_e
n
try_inte
r
esti
n
g(
)
: Make retur
n
value
m
ore specifi
c
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-26
Elija
h
Newren
tree-w
a
l
k: Correct bitrotted
comme
n
t
about tr
e
e_entry()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-26
Elijah New
r
en
Do
c
ument pre-condi
t
ion for
tree_en
t
r
y
_interesting
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-25
E
l
ijah N
e
wren
tree-walk: Cor
r
ect bitrotted comment a
b
out tr
e
e_entry()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-20
E
li
j
ah Newren
merge-recursive: Avoid
e
xcessive o
u
tput for and repr
o
cessi
n
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Eli
j
ah N
e
wren
me
r
ge-recursive: F
i
x
m
ultiple file rename across D
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
El
i
jah Newren
t6031: Ad
d
a
testcase cove
r
i
n
g multipl
e
renam
e
s
across
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Elijah Newren
merge-recursive: F
i
x typo
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-13
El
i
jah Newren
Mark
tests that use symlinks as needin
g
SYMLI
N
KS prerequis
i
te
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-13
Elijah Newren
pull --rebase: Avoid spurious conflicts and reapplying
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-13
Elijah N
e
wre
n
t
5
520-p
u
ll: Add testcases sh
o
wing spuriou
s
conflicts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-02
Elijah Newr
e
n
upload-pack: Impr
o
v
e e
r
r
or
m
essage when
b
ad ref requested
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
Elijah N
e
wren
fast-ex
p
o
r
t:
Add a --full-tree option
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
Elijah
N
ewren
f
a
st-expo
r
t: Fix dr
o
pping of
f
i
les wit
h
--import-marks
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-09
Elijah Ne
w
ren
f
a
s
t
-impor
t
: Improve robustness when D->F ch
a
nges provi
d
ed
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-09
Elij
a
h Newren
fa
s
t
-export: Fix
output order of D/F changes
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-09
El
i
jah Newren
merge_recur
s
ive
:
Fix renames a
c
r
oss paths below
D
/F
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-09
Elijah Newren
merge-recursive:
Fix D/F c
o
nflicts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-09
Elijah Newren
Add a
d
ditio
n
a
l testcases for D/F
c
onfli
c
ts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next