repo.or.cz
/
git
/
mingw.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'jh/update-ref-d-through-symref' into maint
2012-10-21
J
ohan Herland
Fix failure t
o
delete a pac
k
ed
ref thro
u
gh a symref
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Joha
n
H
e
rland
t1400-upd
a
te-ref: Add
t
est verif
y
in
g
b
u
g with
symrefs
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
J
ohan Her
l
a
nd
notes
-
merg
e
: D
o
n't
r
emove
.
git/NOTE
S
_
MERGE_WORKTREE
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Johan Herland
notes-merge: use opendir
/
readdir i
n
stead of using
r
ead_dire
c
.
.
.
Updated-by:
Johan Herland
<johan@herland.net>
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Johan Herland
t3310:
i
ll
u
strate failure to "notes mer
g
e
-
-commit
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan Herla
n
d
fast-im
p
o
r
t: Fix incorre
c
t fanout le
v
el when modifying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan
Herland
t9301: Ad
d
2
nd testcase exposing
b
ugs
i
n fast-import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
J
o
han Her
l
a
n
d
t9301: Fix te
s
tca
s
e covering
u
p a
bu
g
in fast-import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-05-13
Johan
Herland
t5400: Fix a
couple of typ
o
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan
H
e
r
l
and
M
ark dirstat error messages
f
or tra
n
s
l
a
tion
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
J
ohan Herland
Improve error handling when
parsing dir
s
tat parameters
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herl
a
nd
N
ew
--dirsta
t
=
l
ines
m
ode,
doing
d
irsta
t
analysis b
a
sed
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Jo
h
an Herland
Allow
s
pecifying --dirstat cut-o
f
f percentage as
a
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Add config variab
l
e f
o
r sp
e
ci
f
ying de
f
ault --dirstat
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herla
n
d
Refactor -
-
dirs
t
at parsing; dep
r
ecat
e
--cumulative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan H
e
rland
M
a
ke --dirstat=0 out
p
ut
d
irectories
that
c
ontribute
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Joh
a
n Herlan
d
Ad
d
seve
r
al tes
t
cas
e
s for --di
r
s
tat a
n
d friends
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-12
Johan Herland
--dirstat: In case of
r
e
names, use
targe
t
filename
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
J
ohan Herland
Teach
--
d
ir
s
t
a
t
not t
o
c
omplete
l
y
i
gnore rearranged
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Joh
a
n H
e
rl
a
nd
-
-dirstat-by-fil
e
: Make
it faster and mor
e
correct
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herl
a
n
d
-
-
d
irs
t
at
:
D
e
scr
i
be non-ob
v
i
o
u
s d
i
ffere
n
c
es relative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
J
oh
a
n Herland
Make
"git notes
add" more user-friendly when th
e
r
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Johan Herland
log
/
prett
y
-op
t
io
n
s: D
o
cument --[no-]notes and depr
e
cate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-17
Johan Herland
bran
c
h/checkout --track
:
E
n
sure t
h
at upstream branch
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-16
Johan
H
e
rland
push
.
defa
u
lt: Rename 'tracking' to 'upstream'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herla
n
d
Prov
i
de 'g
i
t merge --abor
t
' as a s
y
n
onym to
'
git
reset
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
c
m
d_merge(): Parse options be
f
ore check
i
n
g
MERGE_HEA
D
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan H
e
rla
n
d
Provide
'git note
s
g
et-re
f
' t
o
easily retrieve curre
n
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
g
i
t
n
otes me
r
ge:
Add te
s
tcases for m
e
rging
no
t
e
s
trees
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herland
git n
o
t
es merg
e
:
A
dd another
a
ut
o
-resolving s
t
rategy
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
land
git notes merge: --c
o
mmit should f
a
il if
u
nder
l
ying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herland
git not
e
s merge: List conflicting notes
in not
e
s merge
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git no
t
e
s
merge: Manual
conf
l
ict res
o
lution,
part 2/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git n
o
tes merge:
Manu
a
l conflic
t
resolu
t
i
o
n, part
1
/
2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an H
e
rland
Doc
u
mentation: Preliminary
d
ocs on 'gi
t
not
e
s merge'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes me
r
g
e:
A
dd aut
o
matic
c
onflict resol
v
e
r
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erland
git
notes merge: Ha
n
d
l
e
rea
l
,
non-conf
l
icti
n
g notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
and
b
uiltin/notes
.
c: Refa
c
tor creat
i
on
o
f notes commits
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n
Herland
git notes merg
e
: In
i
tial implemen
t
ation han
d
ling tri
v
ial
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herland
bu
i
ltin/n
o
t
e
s
.
c: Split notes
ref
D
W
I
Mmery into a separate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
notes
.
c: Use two
n
ewlines
(instead of one) wh
e
n concat
e
natin
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herl
a
nd
(trivial
)
t3303: Inde
n
t with
tabs instead of spaces
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Herland
notes
.
h/
c
: Propagate co
m
bine
_
notes
_
fn return value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
J
ohan
H
erland
notes
.
h/c: Allow
c
o
m
bi
n
e
_notes functions to rem
o
v
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
J
o
han Herla
n
d
no
t
es
.
c: R
e
o
rder funct
i
o
ns in preparation fo
r
next
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
J
o
han Herland
notes
.
h: Make
d
e
f
a
ult_
n
otes_r
e
f() available in notes API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Joh
a
n
Herland
(trivial) no
t
es
.
h
: M
i
nor documentation fixe
s
t
o
co
p
y_not
e
s(
)
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herla
n
d
notes
.
c: He
x
ify S
H
A1 in die
(
) message from
i
ni
t
_
notes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-08-31
J
ohan Herlan
d
not
e
s
:
Don't c
r
eat
e
(
empt
y
) comm
i
t when removing non
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Jo
h
an Herland
Enabl
e
custom schemes for co
l
umn colo
r
s
i
n
the graph API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan Herland
Make gra
p
h
_
next_line(
)
a
v
ailable in the g
r
aph
.
h API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herla
n
d
revision: Turn off history simpl
i
fication in --ance
s
try
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Joha
n
Herland
revision: F
i
x typo
i
n -
-
ancestry-path error message
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
J
o
han H
e
rland
Documenta
t
i
o
n
/
r
e
v
-
l
i
st-options
.
t
x
t: Explain --ancestry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
J
ohan Herland
D
o
cumentation/rev-l
i
st-options
.
txt: Fix missing line
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-01
Johan Herland
di
f
f
.
c: Ensure "index $f
r
o
m
.
.
$to" line contai
n
s unambigu
o
us
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-25
Johan He
r
land
bu
i
ltin
-
notes: Minor (mostly pars
e
_o
p
tions-rela
t
ed
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-17
Johan Herland
submodule sum
m
ary:
D
o
n
't barf when invo
k
ed in an
e
m
p
ty
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
oha
n
Herlan
d
builtin-
n
ote
s
: Add "copy" subcommand
f
or copying notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
builtin-
n
o
t
e
s: Misc
.
refactoring of argc
a
nd e
x
it v
a
lue
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
builtin-not
e
s:
A
d
d
-c/-C
opti
o
ns for
r
e
using notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
b
u
i
ltin-note
s
: R
e
fac
t
or handli
n
g
o
f
-F o
p
tion to
all
o
w
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erl
a
nd
b
uiltin-notes: Deprecate the
-m/-F options for "git
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
builtin-note
s
:
Add "append" subcommand
f
or appen
d
ing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erlan
d
builtin-notes: Add "add
"
subcommand
f
o
r
ad
d
ing notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan
H
erland
builtin-notes: Add --message/--file alia
s
es fo
r
-
m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Her
l
and
builtin-n
o
tes: Add "l
i
st" s
u
b
co
m
mand
f
o
r listing
n
ote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Documentation
:
Generalize gi
t
-notes docs to 'ob
j
ects
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erland
builtin-notes: Add
"
p
r
une" subcom
m
and for removing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
Not
e
s
AP
I
: prune_
n
otes(): Prune notes tha
t
b
el
o
ng to
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herland
t3305: Verify that
r
e
m
oving n
o
tes triggers
au
t
o
m
a
t
ic
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
builtin-notes: Add "remov
e
"
s
ubco
m
m
a
nd for removing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han
H
erland
Teac
h
builtin-notes to remove empty notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Her
l
a
n
d
Tea
c
h
not
e
s code to properl
y
p
reserve n
o
n-
n
o
t
es in
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
t3
3
05:
V
e
r
if
y
that adding
m
any
n
otes with git-notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
t330
1
: Verify su
c
ces
s
f
u
l annotati
o
n of
non-
c
omm
i
ts
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
Builtin-i
f
y git-notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
R
efactor notes con
c
atenat
i
on in
t
o a flexible
interface
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an
H
erla
n
d
N
otes AP
I
: Al
l
ow
multipl
e
concurrent notes trees wi
t
h
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes API: write_notes_tree():
Store th
e
notes tree
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Not
e
s
AP
I
: f
o
r_e
a
ch_note(): T
r
aver
s
e the
e
ntire
n
ot
e
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes
A
P
I: get_note(): Return the
note
a
nnotating the
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes
A
PI:
remove
_
no
t
e():
R
emove not
e
ob
j
e
cts from
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
l
a
nd
N
otes A
P
I: add_note(
)
: Add no
t
e objects
t
o
the i
n
ternal
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erland
No
t
es API
:
i
nit_notes():
Ini
t
i
aliz
e
th
e
note
s
tree
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herl
a
nd
Add tests
for checkin
g
co
r
rect han
d
ling of $GIT_
N
OTES_REF
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
an Herl
a
n
d
Notes API
:
get_commit_no
t
es() -> f
o
rmat_note
(
) + remove
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
Minor
c
osmetic fixes to notes
.
c
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-01-26
J
o
han
H
e
rland
built
i
n
-con
f
ig: Fix crash
wh
e
n using "-
f
<
r
e
lat
i
ve
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Johan Herl
a
nd
Add more t
e
stcases to te
s
t fa
s
t-impor
t
of notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Johan Herland
Rename t9301 to
t9350, to ma
k
e room for more
fast-import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Johan
H
e
r
land
fast-impor
t
: Proper
notes tre
e
manip
u
lation
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-03
Johan Her
l
and
Fix
crasher
o
n
encoun
t
ering SHA1-like no
n
-note in not
e
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-11-18
J
oha
n
H
e
rl
a
nd
B
asic build infrastructure
f
or
P
y
t
hon s
c
ripts
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
J
ohan Herland
Add selftests ve
r
ifying concatenat
i
o
n
o
f multi
p
l
e
note
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herla
n
d
Refact
o
r
n
otes code to c
o
ncaten
a
te multi
p
le notes annotating
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
J
o
han
H
e
rland
Add selfte
s
t
s
verifyi
n
g that we can parse note
s
t
r
ees
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan H
e
rland
Teach the notes
l
o
okup code to parse notes trees with
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Joh
a
n Herland
Teach notes cod
e
to free its internal d
a
ta
s
truct
u
re
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan
H
er
l
a
n
d
Add flag
s
t
o
get_commit_notes() to control the fo
r
mat
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
next