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
notes-merge: use opendir/readdir instead of using read_directory()
2012-03-15
Johan
H
e
r
land
notes-merge:
u
se opendir/readdir instead of using rea
d
_direc
.
.
.
Updated-by: Johan Herland <
johan@herland.net
>
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-03-15
Johan Herland
t3310
:
illustrate failure to "notes
merge --co
m
mit
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-11-29
Joh
a
n H
e
rla
n
d
fast-import: Fix incorrect
f
anout
l
e
v
el wh
e
n modifying
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-11-29
Johan
H
erland
t9
3
01: Add 2nd testcase ex
p
osing bugs in fast-impo
r
t
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-11-29
Johan Herland
t9301: Fix
te
s
tcase c
o
vering
up a bug
in
f
ast-import
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-05-13
Johan Herland
t5400
:
Fi
x
a couple of
typos
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Mark di
r
s
t
at error messages
f
or tr
a
ns
l
a
tion
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Joha
n
Herland
I
m
prov
e
error handling when parsing di
r
s
t
at parameters
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Joha
n
Herland
New --dirstat=
l
ines mo
d
e, doing dirs
t
at analysis bas
e
d
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
J
o
h
an
Herland
A
l
low spec
i
fying -
-
d
irstat cut-off percentage as a
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan
H
er
l
a
n
d
Add co
n
fig variable for specifying default --dirstat
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
J
ohan Herl
a
nd
Refactor --dirstat
parsing; deprecate --cumula
t
ive
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Her
l
and
M
ake -
-
dirstat=0 ou
t
put directories that contribu
t
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herl
a
nd
Add
several testca
s
es for
--dir
s
tat
a
nd frien
d
s
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-12
Joh
a
n H
e
rland
--d
i
rstat: In case
o
f
renames, use
t
arget
f
il
e
name
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
Johan He
r
lan
d
Teach --di
r
s
t
a
t not
t
o
c
ompletely ignore rearranged
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
Johan H
e
rl
a
n
d
--dirstat-by-file: Make it faster an
d
more cor
r
ect
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
Joh
a
n Herland
--dirst
a
t:
Descr
i
be
n
on-obvious differences relative
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-03-30
J
o
h
a
n
H
erland
Make "git n
o
tes
add"
m
ore
user-friendly whe
n
t
h
er
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-03-30
Johan Herland
log/pretty-options: D
o
cumen
t
--[n
o
-]notes
and de
p
recate
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-02-17
Jo
h
an Herland
bra
n
ch
/
checkout --track:
Ensure that upstream branch
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-02-16
Johan
H
e
rland
pus
h
.
d
e
fault: Re
n
ame
'tracking'
t
o
'
u
p
stream
'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
Provi
d
e 'git
merge --
a
bort' as a synonym to 'git
r
e
s
et
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herl
a
nd
c
m
d_m
e
rge(
)
:
P
arse options be
f
ore c
h
ecking MERGE_HEAD
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Herland
Pr
o
v
ide 'git n
o
tes get-ref' to easily
retrieve
cu
r
rent
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git n
o
t
e
s merge:
A
dd testcases
for mer
g
ing notes trees
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herland
git
n
otes
m
erge: Add another aut
o
-resolving strategy
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herland
git
n
o
tes merge: --commit should fail if
u
nderlying
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
er
l
and
git not
e
s
merge: Lis
t
conflicting not
e
s in notes m
e
r
g
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes merge: Manual conflict resolution, p
a
rt
2
/2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herland
git notes merge: Man
u
al
conflict resolution, part 1/2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
Documentation: Preliminary doc
s
on 'git n
o
t
e
s
m
erge'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
H
e
rl
a
n
d
git n
o
tes merge: Add
automatic conf
l
ict resolvers
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Herland
git notes merge: Handle
r
eal, non-conflicting notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
builtin/notes
.
c: Refactor crea
t
ion of notes co
m
mi
t
s
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Herland
g
it
n
o
t
es mer
g
e
:
Initial i
m
p
l
emen
t
a
t
i
o
n
handl
i
ng tri
v
ial
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
builtin/notes
.
c:
Split notes ref DW
I
Mmery into a
separate
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herland
notes
.
c: U
s
e two
n
ewli
n
es (instead of one)
when concat
e
natin
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herland
(t
r
ivial) t3303:
Indent with tab
s
in
s
t
e
a
d
o
f
spaces
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
notes
.
h/c: Propag
a
te c
o
mbin
e
_notes_fn return va
l
ue
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan He
r
la
n
d
no
t
es
.
h/c: Allow combine_notes function
s
to
r
emove
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
notes
.
c:
R
e
o
rder functions in preparation for nex
t
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herl
a
nd
notes
.
h:
Make default_notes_ref(
)
available in notes API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Jo
h
an Herland
(t
r
ivial)
notes
.
h: Minor
d
ocumen
t
ation f
i
xes
to co
p
y
_
notes()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
n
o
t
e
s
.
c
: Hexify
S
HA1 in die() messag
e
from init_notes()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-08-31
Johan Herland
no
t
es: Don'
t
creat
e
(
e
m
pty) commit w
h
e
n
remov
i
ng no
n
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-07-13
Johan Herlan
d
Enable custom
s
chemes for column
colo
r
s
in the graph API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-07-13
J
o
han Herla
n
d
Make graph_next_l
i
ne(
)
availab
l
e in the graph
.
h AP
I
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan
H
e
r
land
revisi
o
n:
Turn off
h
istory simplification in --ance
s
try
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
J
o
han Herlan
d
revision: Fix typo in -
-
ancestry-path
error
me
s
s
age
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Joha
n
Herland
Documentation/rev-list-opti
o
ns
.
txt: Ex
p
lain --
a
nce
s
try
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
D
o
cumentation/rev-l
i
s
t-options
.
txt: Fix m
i
ssing
l
ine
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-01
Joha
n
Her
l
and
diff
.
c: En
s
ure "index $from
.
.
$to" line contains
u
nambiguous
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-25
J
oha
n
Herland
built
i
n-notes: M
i
no
r
(mo
s
tly parse_o
p
tions-related
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-17
Johan
Herland
s
u
bmodule summary: Don't
ba
r
f
w
hen invoked in an empty
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
builtin-notes:
Ad
d
"c
o
py" subcom
m
and for copying notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an H
e
r
la
n
d
builtin-notes
:
M
i
s
c
.
re
f
a
c
toring of argc and exit value
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erland
bu
i
ltin-
n
o
tes: Add -c/-C options for reusing
notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
a
n H
e
rla
n
d
builti
n
-notes: Refactor
handling of -F o
p
tion
t
o allow
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herl
a
nd
buil
t
i
n
-notes: Deprecate the -m/
-
F options f
o
r "gi
t
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
bu
i
ltin-notes
:
Ad
d
"app
e
n
d
" subcommand
f
or appending
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Her
l
an
d
built
i
n-n
o
t
es:
A
d
d "add" subcommand for add
i
n
g notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han
H
erland
buil
t
in-n
o
t
e
s:
Add
--message/--file aliase
s
fo
r
-m
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan
H
erland
builti
n
-note
s
: Add "l
i
st" subcom
m
a
n
d fo
r
listi
n
g
n
ote
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Docum
e
ntation:
Genera
l
ize git-notes docs to 'o
b
j
e
c
ts
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan
Herland
builtin-not
e
s: Ad
d
"prune" s
u
bcommand for r
e
moving
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n H
e
rland
Notes API: prune
_
notes(): Prune notes that belo
n
g
to
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herla
n
d
t3305: Verify
that removing notes
t
rigge
r
s automatic
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
b
u
iltin-notes:
Add
"remov
e
" subcommand for rem
o
vi
n
g
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
lan
d
Teach buil
t
in-no
t
es to
r
emove
empty notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
r
land
Teach n
o
tes code
t
o prope
r
ly preserve
n
on-note
s
in
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han
H
e
rland
t3
3
0
5
:
Verify that
adding many notes
w
ith g
i
t-notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
a
n Herland
t
3
3
0
1: Verify success
f
u
l a
n
notation of non-commits
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Bu
i
l
t
i
n
-ify git
-
notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Refactor notes concatenat
i
on
i
nto
a flex
i
ble interface
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
N
o
tes A
P
I:
Al
l
ow mu
l
tiple concu
r
rent notes
t
rees with
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
Notes A
P
I:
write_notes
_
tr
e
e(): Sto
r
e the not
e
s tree
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
N
otes API: for_each_note():
T
rav
e
rs
e
t
h
e entire
n
o
t
e
s
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
N
o
tes API: get_note(): Re
t
urn
t
he note ann
o
tating th
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
e
r
land
Notes API: remov
e
_note():
Remove note objects from
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan
H
e
r
land
N
o
tes API: add_note()
:
Add note obj
e
cts
t
o the inte
r
na
l
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
N
o
tes A
P
I: init_notes(): Init
i
al
i
ze
the notes tree
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
r
l
and
Add tests for checking
correct handli
n
g of $GIT_NOTES_REF
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes AP
I
: get_commit_notes() -> forma
t
_note()
+ remove
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
oh
a
n Herland
M
inor cosm
e
tic f
i
xes to notes
.
c
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-01-26
Jo
h
an He
r
l
and
builtin-conf
i
g: Fix
cr
a
sh when using "-f <
r
elative
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-07
Jo
h
an Herland
Add more testcases to test fast-import of notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-07
Johan He
r
land
R
e
name
t
93
0
1 to t9350, to make roo
m
for more fast-import
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-07
Jo
h
an Herland
f
a
s
t
-
i
mport: Pr
o
per notes tree manip
u
lation
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-03
Johan Herl
a
nd
Fix cras
h
er o
n
encoun
t
ering
S
HA1-
l
ike no
n
-
note in notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-11-18
Jo
h
a
n
Herland
Basic b
u
ild infr
a
s
tructu
r
e for Python scripts
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
J
o
h
a
n
Herland
Add selfte
s
ts ve
r
i
f
yin
g
concaten
a
tion of multipl
e
notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
J
o
h
an
Herland
Refact
o
r notes code to concatenate multiple notes a
n
notating
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
Add s
e
lf
t
ests v
e
r
i
fying that we can parse notes t
r
e
e
s
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Johan
Herlan
d
T
e
ach the notes look
u
p code to pa
r
s
e
notes trees with
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herla
n
d
Teach notes code to free its internal data stru
c
tures
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
Add flags to get_commit_notes() t
o
control
t
he format
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
J
ohan Herland
t3302-notes-index-expensive: Speed up create_repo()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
J
ohan Herland
fast-import: A
d
d support for i
m
porting
c
om
m
it no
t
e
s
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Johan Her
l
an
d
Teach "-m <msg
>
" and "-F
<
file>" to "git
n
ote
s
edit"
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
next