repo.or.cz
/
git
/
jnareb-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
t1400-update-ref: Add test verifying bug with symrefs in delete_ref()
2012-10-21
Joha
n
Herland
t1400-update-re
f
: A
d
d test verifying bug
w
ith
s
ymre
f
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
J
o
han Herland
notes-merge: Don
'
t remove
.
git/NOTES_M
E
R
GE_WORKTREE
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Johan Herland
notes-merge: use ope
n
d
ir/readdir instead of using
read_dir
e
c
.
.
.
Updated-by:
Johan Herland
<johan@herland.net>
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
J
o
han Herland
t
3
310
:
il
l
us
t
rate
f
ail
u
re to
"notes merg
e
--co
m
mit
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
J
o
han Herland
fas
t
-import: Fix
i
nco
r
rect fanout level when mo
d
ifying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan Herl
a
nd
t9301: Add 2nd testcase
e
xposin
g
bugs in fast
-
import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan H
e
rland
t
9301: Fix testcas
e
cover
i
ng up a bug in fast-im
p
ort
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-05-13
Joh
a
n Herlan
d
t5
4
00: F
i
x a coup
l
e of typos
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Joha
n
Herland
Mark dirstat err
o
r messages for t
r
an
s
lation
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan
H
erland
Improve error handling when
parsin
g
dirstat
p
a
r
ameters
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
New --dir
s
tat
=
lines
mode
,
doing dirstat an
a
l
y
sis
b
ased
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
J
o
han H
e
rlan
d
Al
l
ow specifyin
g
-
-di
r
s
tat cut-of
f
percentag
e
a
s
a
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Joha
n
Herland
Add config varia
b
l
e
f
or specifyi
n
g d
e
f
a
u
lt
-
-
dir
s
tat
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
J
o
han Herland
Ref
a
ctor --dir
s
tat pars
i
n
g;
d
eprecate --cum
u
lativ
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Her
l
an
d
Make --dirstat=0 output
d
irectories
t
hat contribute
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
J
o
h
an He
r
land
Add seve
r
al testcases
f
or --dirsta
t
a
nd
f
r
ie
n
ds
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-12
J
o
han Herland
--dirstat: In
c
ase of r
e
nam
e
s, use t
a
rget filename
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
Te
a
ch --dirstat n
o
t to complet
e
l
y ignore re
a
rr
a
n
g
e
d
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan H
e
r
land
-
-di
r
s
tat-by-file:
M
ake it fas
t
er and more correct
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan He
r
land
--dir
s
tat: Describe no
n
-o
b
vious differences
r
ela
t
iv
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
J
ohan
H
erland
Make "g
i
t notes add" more
user-friendly
w
hen there
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Jo
h
an
Herlan
d
log/pretty-options: Docu
m
ent -
-
[n
o
-]no
t
es and deprecate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-17
Johan
Herland
b
r
a
n
ch/checkout --track:
Ensure that upstream branch
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-16
Johan
Herla
n
d
p
u
sh
.
d
efault: Rename 'tracking' to 'upstre
a
m'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herla
n
d
Provide 'git me
r
g
e
--
a
bo
r
t'
a
s a synonym to 'gi
t
re
s
et
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
cmd_merge()
:
Pa
r
se options before che
c
k
ing M
E
RGE_HEAD
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Herland
Provide '
g
it notes
get-ref' to
e
asily retrieve
c
urrent
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
and
g
it n
o
tes merge: A
d
d testcas
e
s
for mergin
g
notes
t
rees
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes merge: Add anot
h
e
r
auto-resolving
s
trategy
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herland
g
i
t notes m
e
rge: --commi
t
shou
l
d
f
ail if underlying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes merge: List co
n
fli
c
ting note
s
in
not
e
s merge
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git no
t
es me
r
ge: Ma
n
ual conflict resolu
t
ion,
pa
r
t
2/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git note
s
merge: Manual con
f
lict res
o
lution, part 1/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Herlan
d
Documen
t
ati
o
n: Preliminar
y
docs on 'g
i
t notes merg
e
'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herla
n
d
g
it note
s
merge:
A
d
d aut
o
matic
c
o
n
flict reso
l
vers
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
H
e
rland
git notes me
r
ge: Handle real,
n
on-confli
c
tin
g
notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herl
a
nd
builtin/notes
.
c: Refacto
r
cr
e
ation of note
s
commits
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herla
n
d
git
n
otes mer
g
e: Ini
t
ial
i
mpleme
n
t
a
t
i
o
n handli
n
g
t
ri
v
ial
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
He
r
lan
d
builtin/notes
.
c
:
Split notes ref DWIMmery into a separat
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Herland
notes
.
c: Use two newlines (in
s
t
e
ad of one) w
h
en concatenatin
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
(trivial)
t
3
3
0
3: In
d
ent
w
i
th t
a
bs ins
t
ead
of space
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
h
a
n
Herla
n
d
notes
.
h/c:
Prop
a
gate combine_
n
ot
e
s_f
n
retu
r
n value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Joha
n
Her
l
a
n
d
n
o
t
es
.
h/c:
A
l
l
ow combine_notes functions to remove
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
notes
.
c:
R
eorde
r
functions
i
n
p
reparation
fo
r
next
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
J
o
han Herland
notes
.
h: Make def
a
ult_notes_re
f
() ava
i
lable in notes API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herla
n
d
(
t
rivial) no
t
es
.
h
:
M
inor documen
t
ation fixes to cop
y
_
notes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
note
s
.
c
:
H
e
x
i
fy SH
A
1 in die() me
s
s
age from ini
t
_no
t
es()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-08-31
Johan Herland
notes: Don'
t
cr
e
ate (empty) c
o
mmit when removing non
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
J
o
han Herland
Enabl
e
custom sch
e
mes for column colors in the g
r
aph
A
PI
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan Herl
a
nd
Make
graph_ne
x
t_li
n
e() a
v
ailable in th
e
grap
h
.
h API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
revis
i
on:
T
u
r
n off his
t
ory simplifica
t
ion
in --ancestry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Joh
a
n
Her
l
and
revision
:
Fix typo in
-
-ancestry-path er
r
or m
e
s
sa
g
e
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
J
o
han Herland
D
ocumentation/rev-list-options
.
txt: Expl
a
i
n --ancestry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
J
o
han
Herlan
d
Documentation/rev
-
li
s
t-options
.
t
x
t: Fix missi
n
g
l
in
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-01
Johan Herland
d
i
ff
.
c: Ensure
"ind
e
x $fr
o
m
.
.
$t
o
" line contain
s
unambiguo
u
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-25
Jo
h
an
H
erland
buil
t
in-notes
:
Minor
(
mostl
y
parse_options-related
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-17
Jo
h
an Her
l
and
submodule summary: Don't
bar
f
when invoked
i
n an empty
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
an H
e
rlan
d
builtin-n
o
tes: Add "copy" subcomm
a
n
d for copying
notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
builtin-notes: Misc
.
r
e
factor
i
ng of argc and ex
i
t value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
builtin-notes: Add -c/-C options for reusing notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
builtin-n
o
tes
:
Refac
t
or handling of -F opt
i
on to all
o
w
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
buil
t
in-no
t
es: De
p
r
ecat
e
the -m/-
F
options f
o
r "git
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
builtin-notes: A
d
d "a
p
pend"
s
ubc
o
mmand fo
r
append
i
ng
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
built
i
n-notes: Add "ad
d
" subcomma
n
d fo
r
ad
d
ing
notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-
n
o
t
e
s: A
d
d --m
e
ssage/--file al
i
ases for -m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-notes: Ad
d
"list" subcommand for listing
not
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
H
erland
Documentation: G
e
ne
r
alize git-notes docs to 'objects
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-notes: Add
"prune
"
subcomm
a
nd for
r
emoving
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
Notes
API: p
r
une_
n
otes(): Prune notes tha
t
belong to
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
t3305:
Verify that rem
o
ving notes tri
g
gers autom
a
ti
c
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
b
ui
l
ti
n
-notes: Add "remove" su
b
command for removing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
er
l
and
Teach builtin-notes to remove em
p
t
y
notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erlan
d
T
each
n
o
t
e
s co
d
e to proper
l
y
pr
e
serv
e
n
o
n
-
notes
in
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
t3305: Ve
r
ify th
a
t
a
d
din
g
m
a
ny not
e
s
with git-notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herlan
d
t3301: Verify suc
c
es
s
f
u
l
anno
t
ation of non-commits
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
oh
a
n
He
r
lan
d
Builtin-ify git
-
notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
R
e
factor
no
t
es concate
n
a
t
ion i
n
to a flexible interfac
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
No
t
e
s AP
I
: Al
l
ow m
u
ltiple con
c
u
r
r
e
nt notes
trees
w
ith
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han
Herland
N
otes API: wr
i
t
e
_
n
o
tes_tree
(
)
: Store the n
o
tes
tr
e
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes API:
f
or_each_note()
:
Tr
a
verse
the entire
no
t
es
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
Notes API: get_not
e
(): R
e
turn
t
he
n
ote
a
nnotating the
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes
A
PI: remove_note(): Remo
v
e
n
ote objects fr
o
m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
Notes API: add_note(): A
d
d note objects
to the
i
nternal
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
Notes API:
i
nit_notes():
Initia
l
ize the notes
tree
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
r
l
and
A
d
d
test
s
for checki
n
g correct handling of $GIT_NOTES
_
REF
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
Notes API: get_comm
i
t_not
e
s() ->
f
orma
t
_n
o
te() + rem
o
ve
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rla
n
d
Minor cosm
e
tic fixes to notes
.
c
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-01-26
Johan Her
l
a
n
d
builtin-config: Fix
c
rash
w
hen using
"
-f
<
relative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Johan
Herla
n
d
Add more te
s
tcases to t
e
st fast-import
o
f
notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Johan Herland
Rena
m
e t9301 to
t
935
0
, to make room
f
or
m
or
e
fast-import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
J
o
h
a
n H
e
r
land
fast-import: Proper notes tree
m
anipulation
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-03
Johan H
e
rland
F
i
x crasher
on encountering
S
H
A
1-like
non-note in
notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-11-18
Joha
n
Herland
Ba
s
i
c b
u
ild infrastructure for Python scripts
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herl
a
nd
Add self
t
es
t
s ve
r
ifying co
n
catenation of multiple notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
J
o
han He
r
land
Refactor notes code to
c
onc
a
tenate multiple
n
ot
e
s annotating
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
Add selftests verify
i
ng that
w
e can pa
r
se notes trees
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
J
o
h
a
n Herland
Teach the notes l
o
o
k
up code
t
o
p
arse no
t
es trees with
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Joha
n
Herland
Te
a
ch notes
c
ode
t
o
f
r
ee its inter
n
al data str
u
ctures
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Joha
n
He
r
l
an
d
Add flags to get_commi
t
_notes(
)
to
c
ontrol th
e
format
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan
H
erl
a
nd
t3302-n
o
tes
-
index-expensive: Speed u
p
create_repo()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
next