repo.or.cz
/
git.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
J
o
han
He
r
land
g
it not
e
s merge: Ha
n
dle real, non-confli
c
ting notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herlan
d
builtin/notes
.
c: Refactor cr
e
at
i
on of notes
c
omm
i
t
s
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
He
r
l
a
nd
git notes m
e
rge: Initia
l
im
p
lemen
t
ation h
a
ndli
n
g trivial
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
rland
buil
t
i
n
/notes
.
c: Split
n
o
tes ref DWIMmery into a separate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herlan
d
notes
.
c: Use two newlines (
i
nste
a
d of one) wh
e
n
concate
n
atin
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
(tri
v
ial) t3303: Indent with tabs instead of
s
paces
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herl
a
n
d
n
o
tes
.
h/c: Propagat
e
co
m
bin
e
_
n
otes_f
n
ret
u
r
n
value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
notes
.
h/c: Allow
combine_notes
func
t
i
on
s
to remove
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan
H
er
l
and
notes
.
c: Reorder
f
unctions
in preparatio
n
for n
e
x
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
not
e
s
.
h: Mak
e
default
_
n
o
t
es_ref() avai
l
able in notes API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Joh
a
n
H
erlan
d
(tri
v
ial) n
o
tes
.
h
:
Min
o
r
docu
m
entation fixes
t
o
copy_notes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Joh
a
n Herland
notes
.
c
:
Hexify SHA1 in die() messa
g
e from init_notes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
revision: Turn off
h
isto
r
y simplification in --ancestry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Her
l
and
r
e
visio
n
: Fix typo in --a
n
cestry-path error m
e
s
s
a
ge
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herla
n
d
Documen
t
ation/
r
ev-li
s
t-op
t
ions
.
txt
:
Explain --ancestry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Jo
h
a
n
Herland
Do
c
umen
t
at
i
on/rev-lis
t
-option
s
.
t
x
t:
F
ix m
i
s
s
ing line
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-01
Johan Herland
diff
.
c: Ensure "index $from
.
.
$
to"
line contains unambiguous
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-25
J
ohan
Herlan
d
builtin-notes:
Minor (mostly pars
e
_options-rel
a
ted
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-17
J
o
han Her
l
and
submodule s
u
mm
a
ry: Don'
t
barf when invoked i
n
an
e
mpty
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
oha
n
H
e
rland
b
u
iltin-not
e
s: Add "c
o
py"
s
ubcomma
n
d
for co
p
y
i
ng
not
e
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
builtin-notes: Misc
.
re
f
acto
r
ing of argc an
d
ex
i
t va
l
ue
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herl
a
nd
builtin-
n
otes: Add -c/-C options
fo
r
reusin
g
n
o
tes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
builtin-notes: Refactor
h
a
ndling of -
F
op
t
ion to allow
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
H
e
rland
buil
t
in-notes: Deprecate th
e
-m/-F options
for "git
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
builtin-notes: A
d
d "append" subcommand for
ap
p
e
nding
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
built
i
n
-
n
otes: A
d
d
"add" subco
m
mand for adding no
t
es
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erland
builti
n
-notes: Add
--message/--file aliases for -m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
bui
l
tin-notes: Add "
l
ist" subcommand for list
i
ng note
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an
H
e
r
l
a
nd
Documentatio
n
:
Generalize
g
it-notes docs
to
'objec
t
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
bui
l
tin-n
o
tes
:
Add "
p
rune" subcommand for remo
v
ing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
N
otes
API: prune_notes(): Prune n
o
tes that
belong to
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herland
t3305:
Verify t
h
at remov
i
ng
notes t
r
iggers
a
utomatic
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han H
e
rland
bui
l
tin-notes
:
Ad
d
"remove" subc
o
mmand for re
m
oving
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
Teach builtin-notes t
o
r
emove
e
mpty not
e
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
T
e
ach notes code
t
o properly preser
v
e
non-n
o
tes in
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
t330
5
: Verify that adding many notes with git
-
notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n
Herl
a
n
d
t3301: Ver
i
fy
s
uccessful annotat
i
on
o
f non-commits
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
Buil
t
in
-
ify
g
it-notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
a
nd
Refactor notes
concate
n
ation into a flexible
i
nterface
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
Notes A
P
I: Allow mu
l
t
i
p
le concurrent notes trees
wit
h
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
an Herla
n
d
Note
s
A
P
I: write_notes_tre
e
(): Store the notes tree
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n
Herla
n
d
Notes API: fo
r
_e
a
c
h
_note(): Traverse
the entire no
t
es
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes API: get_note(): Retu
r
n the n
o
te ann
o
tating
t
h
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
e
rland
Note
s
API: remove_n
o
t
e
(): Remove
n
o
te objects fro
m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erla
n
d
Notes API
:
a
dd_no
t
e(): Add
note
o
bjec
t
s
t
o the internal
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han He
r
land
Note
s
API: in
i
t_
n
otes(
)
: Initialize
the note
s
tr
e
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rlan
d
Add tests for checkin
g
correct handling of $
G
IT_NOTES_REF
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n
H
er
l
an
d
Notes AP
I
: ge
t
_co
m
m
it_notes()
-
> format_note()
+
r
e
move
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han
Herlan
d
Minor cosmeti
c
fixes to notes
.
c
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-01-26
J
ohan Herland
builtin-config: Fix crash
w
h
en using
"-f <r
e
lative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Johan Herland
Add more te
s
tcases to test fast-import of notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Joha
n
Herl
a
nd
Rena
m
e
t9301 to t9350, to m
a
k
e
room for more fa
s
t
-import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Johan He
r
l
a
nd
fast-import:
P
rope
r
notes tree manipulation
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-03
Joh
a
n
Herl
a
n
d
Fix cr
a
sher on encountering SHA1
-
l
i
ke
n
o
n-note in notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-11-18
Jo
h
an Herland
Basic b
u
i
ld
infra
s
t
ructure for Pyt
h
on scri
p
ts
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
J
o
han He
r
lan
d
Add selftests verify
i
ng concate
n
ation of
m
ultiple
n
otes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
J
o
h
an
H
erland
Refactor n
o
tes c
o
de to concatena
t
e mu
l
tiple no
t
es annotating
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
A
d
d selftests verifying
t
hat we
can parse
notes trees
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan He
r
land
Teach
t
he notes lookup c
o
de to p
a
r
se notes
tre
e
s wi
t
h
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
T
eac
h
notes co
d
e
t
o
free its in
t
ern
a
l d
a
t
a structures
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
J
o
han Herland
Add flags
to get
_
c
omm
i
t_notes() to
c
o
n
trol the f
o
r
m
a
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
J
ohan
Herland
t
33
0
2-notes-index-expensive:
S
p
e
ed up c
r
ea
t
e
_
r
epo()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herlan
d
fa
s
t-i
m
port: Add support for importing co
m
mit notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Joha
n
Herland
Tea
c
h
"-m <ms
g
>" and
"-F <file>" to "git no
t
e
s
ed
i
t"
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-20
J
o
h
a
n H
e
rland
git
c
l
one:
A
d
d
--rec
u
rsive to automatica
l
ly chec
k
o
ut
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-20
Johan Her
l
and
t7407: Use
'
rev-par
s
e --short'
rather than bash's substring
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Johan Herl
a
nd
g
it sub
m
odul
e
status: Add --recursive to recurse into
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
J
ohan Herlan
d
git s
u
bmodule updat
e
: Introduce --rec
u
rs
i
ve to upd
a
te
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Johan Her
l
and
git submodule forea
c
h
: Add --
r
ecursive to recurse into
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Johan H
e
rlan
d
gi
t
submodu
l
e
forea
c
h: test acc
e
ss to submodule
name
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
J
o
han Herl
a
nd
A
d
d s
e
lftest for 'gi
t
s
u
bmodule
f
or
e
ach'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Johan
H
erland
g
i
t subm
o
d
ule: Cleanup usage string and add option
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-18
Joh
a
n
H
erlan
d
git submodule for
e
ac
h
: Pro
v
ide acces
s
to submodu
l
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-12
Johan Herland
help
.
c
:
give cor
r
ect structure's
siz
e
to memset()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-07-11
Johan
H
erland
q
u
ickfetch()
:
Pre
v
ent overflow o
f
the rev-l
i
st
command
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-06-03
J
ohan H
e
rl
a
n
d
git-submodu
l
e
: add s
u
p
port
f
or
--merge
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-06-03
Joh
a
n Herland
Rename submodu
l
e
.
<name>
.
rebase to submodule
.
<
n
ame>
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-04-18
Johan Herland
Update docs on behaviour
o
f 'co
r
e
.
sharedRepository
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-03-28
Johan Her
l
and
Mov
e
chmo
d
(
f
o
o, 0444) into move_temp_to_file(
)
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-09-29
Joh
a
n Herland
Use strc
h
rnul()
i
nstead
of
s
trchr() p
l
u
s
manual
w
orkarou
n
d
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-09-25
Jo
h
an Herland
F
ix
subm
o
dule sync with
rel
a
tive submodule UR
L
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-09-25
J
ohan Her
l
and
for
-
each-ref
:
Fix --format=%(su
b
ject) for log message
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-09-04
Johan Herlan
d
F
ix
A
scii
D
oc error
s
in m
e
rge
d
oc
u
mentation
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-09-02
Johan Her
l
and
Bring loc
a
l clone's
o
rigin URL
i
n line with that of
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-08-21
Johan
Her
l
an
d
Teach
"git diff -p"
H
TML funcname pattern
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-06-19
J
o
ha
n
Herland
Teach "git clone
"
to pack refs
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-06-19
Johan Herla
n
d
Prepare testsuite for a
"
git clon
e
" that packs r
e
fs
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-06-19
Joh
a
n Herl
a
nd
Mo
v
e pack_refs() and friends into libgit
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-06-19
Johan
H
erland
Incorporate fe
t
ch
e
d pa
c
ks in fu
t
ur
e
object
traversal
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-06-15
J
ohan H
e
r
l
and
Th
e
"curl" e
x
ecutable is no longer r
e
quired
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-06-15
Johan Herl
a
n
d
Consisten
c
y
: Us
e
"l
i
bcurl" instead of "cURL
library
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-06-15
Johan Herland
cpi
o
is no long
e
r
used by
g
it-clone
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-05-23
Johan Herland
Add
t
est
for clonin
g
wi
t
h "--refer
e
n
c
e" repo being
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-05-23
Johan Herl
a
n
d
Add a test for another combinati
o
n
o
f --reference
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-02-27
Johan Herland
F
ix '
g
i
t
c
vsexportcommit -w $c
v
sdir
.
.
.
' when used
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-02-27
Johan Herlan
d
A
d
d testcase f
o
r
'
git cvsexpor
t
comm
i
t -w $cvsdir
.
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-02-13
Johan Her
l
and
F
ix 'git
c
vsexportcommit -w $cvsdir
.
.
.
' when us
e
d
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-02-13
J
ohan Herland
Add testcase for 'gi
t
cv
s
exportcommit -w
$
c
vsdir
.
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2007-10-03
Johan H
e
rland
M
ention 'cpio'
d
ependency in
I
NSTALL
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2007-06-09
Johan
Her
l
and
R
e
move unnecessary
code
a
n
d commen
t
s on no
n
-existi
n
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
next