repo.or.cz
/
git
/
dkf.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
git notes merge: Handle real, non-conflicting notes merges
2010-11-17
Johan
He
r
land
g
it notes
merge: Ha
n
d
l
e real,
n
on-c
o
nflic
t
ing note
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
la
n
d
builtin/notes
.
c: Refactor cr
e
atio
n
of
n
otes commi
t
s
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n
He
r
land
g
it n
o
t
es merge
:
I
n
it
i
al im
p
leme
n
tation hand
l
in
g
trivial
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
ha
n
Herland
builtin/notes
.
c:
Split notes ref DW
I
Mmery into a
s
eparate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Herland
notes
.
c: Us
e
t
wo newlines
(
inste
a
d of one)
w
hen concatenati
n
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
(trivi
a
l) t33
0
3
:
Inden
t
with tabs in
s
t
e
ad of spaces
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
and
notes
.
h/c:
P
r
o
p
a
ga
t
e
c
ombi
n
e_no
t
e
s
_fn
r
eturn value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Joh
a
n Herland
note
s
.
h/c:
Allow com
b
in
e
_n
o
tes functions t
o
remove
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan
Her
l
and
notes
.
c
:
Reorder funct
i
o
ns
in preparatio
n
for
nex
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Joh
a
n Her
l
and
notes
.
h: Ma
k
e default_notes_ref() available in notes
A
PI
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
J
o
h
an Herland
(triv
i
al) n
o
tes
.
h: Mino
r
do
c
umentati
o
n fixes to copy_notes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
no
t
es
.
c: Hexify SH
A
1 in die(
)
mess
a
ge from init_
n
otes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
J
ohan Her
l
and
r
evision:
Turn off hist
o
ry sim
p
lifica
t
io
n
i
n
--ancestry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herl
a
nd
r
evision: Fix typo in --ancestry-pat
h
error message
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Jo
h
an Herland
Docume
n
tation/rev-list-op
t
ions
.
txt: Exp
l
ain --ancestry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
Documentation
/
rev-li
s
t-optio
n
s
.
tx
t
: F
i
x
missing line
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-01
Joha
n
Herlan
d
d
if
f
.
c: Ensu
r
e
"index
$from
.
.
$to"
l
ine cont
a
in
s
unambiguous
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-25
Johan
Herland
builtin-notes: Mi
n
o
r
(
mo
s
tl
y
parse_opt
i
ons-rel
a
t
ed
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-17
J
o
han Herland
s
ubmodule
sum
m
ary: Don't barf when
i
nvoked i
n
an em
p
ty
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
bui
l
tin-not
e
s
:
Add "c
o
py"
s
u
bco
m
mand for c
o
p
ying notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an
H
e
r
l
and
builtin-notes: Mi
s
c
.
refactoring
of
ar
g
c and exit v
a
l
u
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herlan
d
b
u
iltin-notes:
Add -c/-C options fo
r
r
e
u
s
ing note
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-notes
:
Refa
c
t
o
r
h
an
d
ling o
f
-F opt
i
on to a
l
low
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
buil
t
in-
n
ote
s
: Deprecate the -m/-F
options for
"git
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han
H
erland
b
u
iltin-notes: Add
"append" su
b
co
m
mand for a
p
pending
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-notes: Add "add"
s
ubcomm
a
nd for adding notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-
n
o
t
es: Ad
d
-
-me
s
sage
/
--file aliases for
-
m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
builtin-no
t
es: Add "list"
subcomm
a
nd
f
o
r
listing note
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
Documentat
i
on
:
Genera
l
iz
e
git-notes docs to 'obj
e
c
t
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
builtin-note
s
: Add "pru
n
e"
s
ubc
o
mman
d
for removing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
an Herland
Notes A
P
I: prune_notes
(
): Pru
n
e
notes that belong to
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
t
3
305: Verify that removing n
o
tes trigger
s
automa
t
ic
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rlan
d
builtin-notes:
Add "remove" subcommand
f
or r
e
mo
v
ing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han He
r
land
Te
a
ch builtin-no
t
es to remove
e
m
p
t
y notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herland
Teach notes code
t
o
properly preserve
non-notes
i
n
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan
H
erland
t3305: Veri
f
y
t
hat adding man
y
notes with gi
t
-note
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
t330
1
: Verify successful annotation of non-commit
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an
Herland
Builtin-ify git-n
o
tes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
R
e
f
a
cto
r
notes concat
e
n
ation into
a
flex
i
ble inter
f
ace
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
Notes API: Allow multiple co
n
current notes trees with
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
Notes API: write_notes_tree
(
): St
o
re the n
o
tes tree
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
He
r
land
N
o
tes API
:
for_each_note(): Traverse the e
n
tire notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes
A
PI:
g
et
_
note
(
): Retur
n
the note annotatin
g
th
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
Notes API: remove_note(): Remove n
o
te obje
c
ts from
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes API: add_note(): A
d
d note objec
t
s to th
e
int
e
rnal
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erland
Notes API: in
i
t_not
e
s(): Initia
l
ize the
n
otes tree
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
Add te
s
ts for checki
n
g
c
o
r
rect
hand
l
ing
of
$
GIT_NO
T
ES_REF
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herl
a
nd
N
otes API: get_
c
ommit_notes() -> format_note()
+
r
e
move
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
Mi
n
o
r
cosmetic fixes
t
o
notes
.
c
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-01-26
Joh
a
n Herland
bu
i
l
t
in-
c
onfig:
F
ix cras
h
when u
s
ing "-f <rel
a
tive
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
J
o
han Herland
Add mor
e
testcases
to
t
est fast-imp
o
rt of notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Johan H
e
rlan
d
Rename t9
3
0
1
t
o t935
0
, to mak
e
room for mo
r
e f
a
st-impor
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Joha
n
H
erland
fast-import: Pro
p
er n
o
t
e
s tree manip
u
lati
o
n
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-03
Johan Herlan
d
Fix crasher on encounterin
g
SHA1-like non-note in
no
t
e
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-11-18
Johan He
r
land
Basic build infrastructur
e
for
Python scrip
t
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herlan
d
Add selftests verifying concatenation of multiple notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
Refact
o
r not
e
s code to
c
onc
a
ten
a
te multiple notes annotating
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Joh
a
n
Herland
Add selftests
v
eri
f
yi
n
g that we can par
s
e
notes trees
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
Teach the notes
loo
k
up code to par
s
e note
s
trees with
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Jo
h
an Her
l
a
n
d
T
e
ach notes code to fr
e
e it
s
int
e
r
nal dat
a
s
t
ructur
e
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
Add flags
to get
_
co
m
m
i
t_note
s
() to contr
o
l t
h
e format
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
t3302-notes-index-expensive: Speed up create
_
rep
o
()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
J
o
ha
n
Herland
fast-
i
mport: Add
s
upport
f
or importing com
m
it notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan
H
erland
Te
a
ch
"-m
<m
s
g>" and "-F <file>" to "git notes
e
di
t
"
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-20
Johan Herland
gi
t
clone: Add --recurs
i
ve to automatically che
c
kout
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-20
Joh
a
n Herlan
d
t7
4
07
:
Use 'rev-par
s
e --sho
r
t' rather than bash
'
s substring
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Joh
a
n Herland
git subm
o
dule status: Ad
d
--
r
ecurs
i
ve to recurse in
t
o
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Jo
h
an Herland
git su
b
module
u
pdate: Introduce --recursiv
e
to update
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Johan Herland
git submodule
foreach
:
Add --re
c
u
r
sive to recurs
e
into
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Johan H
e
rland
git
s
ubmodul
e
foreach:
tes
t
ac
c
ess to submod
u
le
name
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Joha
n
H
e
r
land
Add sel
f
te
s
t for
'git
submodul
e
foreach
'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Johan Herlan
d
git
s
ub
m
odule: Cleanup
u
sage string and add o
p
tion
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-18
Johan Herland
g
it su
b
module foreach:
Provide access to
submodule
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-12
Joha
n
H
e
rland
help
.
c: g
i
v
e correct
s
tructure's size to m
e
mset()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-07-11
Johan Herland
quickfe
t
c
h
()
:
Prevent
o
v
erflow of the
rev
-
list command
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-06-03
Jo
h
a
n
He
r
land
g
i
t-submo
d
ule
:
add
s
uppo
r
t for --m
e
rge
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-06-03
J
ohan
H
erland
Rena
m
e submodule
.
<nam
e
>
.
reb
a
se
t
o su
b
module
.
<na
m
e>
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-04-18
J
o
han He
r
land
Update docs on behaviou
r
of
'co
r
e
.
s
h
a
r
edReposi
t
ory
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-03-28
Johan
Herland
M
o
ve chmod(foo, 0
4
44) into move_te
m
p_to_file()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-09-29
Johan Herl
a
nd
Use strchrnu
l
() instead of strchr() plus manual workar
o
u
n
d
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-09-25
Johan He
r
la
n
d
Fix subm
o
dul
e
sync
with rela
t
i
v
e subm
o
dule URLs
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-09-25
Jo
h
an Her
l
and
for-ea
c
h-re
f
: F
i
x
--
f
ormat=%
(
s
u
bje
c
t) for log message
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-09-04
Joh
a
n
Herland
Fix Asci
i
D
o
c errors
i
n merge docu
m
ent
a
t
i
on
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-09-02
Jo
h
an Herlan
d
Brin
g
l
o
c
al clon
e
's origin
U
RL
i
n
line with that of
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-08-21
Johan Herland
Teach
"
g
i
t
dif
f
-p" HTML funcname patterns
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-06-19
J
oha
n
H
e
rland
Teac
h
"git clone" to pack
refs
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-06-19
J
ohan
H
erland
Prepare te
s
tsuit
e
for a "git clone" t
h
at
packs refs
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-06-19
Johan Herland
Mo
v
e pack_r
e
fs() and fr
i
e
nds
into libgit
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-06-19
J
oha
n
Herl
a
nd
Incorporate
f
e
tched
p
acks in future
o
b
j
ect traversal
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-06-15
Johan Herl
a
nd
Th
e
"c
u
rl" executable is
n
o longer requir
e
d
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-06-15
Johan Herland
Consistency
:
U
se
"
li
b
curl" instead of
"
cURL library
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-06-15
Johan Herland
cpio is no longer use
d
by git-
c
l
o
ne
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-05-23
Johan
He
r
land
Add test for cloning with "-
-
refere
n
c
e" repo b
e
in
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-05-23
Jo
h
an Herla
n
d
Add a test fo
r
an
o
ther
combinatio
n
of
--r
e
f
e
r
ence
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-02-27
Johan Herla
n
d
Fix 'git cvsexpor
t
commit -w $cvsdir
.
.
.
' when us
e
d
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-02-27
J
o
han He
r
land
Add testcas
e
f
or '
g
it cvsexpo
r
tcommit -w $cvsdi
r
.
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-02-13
J
ohan He
r
land
Fix 'git cv
s
ex
p
ortc
o
mmit -w $cvsd
i
r
.
.
.
'
when
used
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-02-13
Johan Herland
Add testcase for 'git cvsexportc
o
mmit -
w
$cvsdir
.
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2007-10-03
Johan Herland
Men
t
i
o
n 'c
p
io' dep
e
ndency in I
N
ST
A
L
L
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2007-06-09
Johan
H
erland
Remove unne
c
essar
y
code and com
m
ents
o
n no
n
-existing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
next