repo.or.cz
/
git
/
debian.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Move copy_note_for_rewrite + friends from builtin/notes.c to notes-utils.c
2013-06-12
Johan Herla
n
d
Move copy_note_fo
r
_rewrite + friends from builtin/notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-06-12
Johan
H
erland
f
inish_
c
opy_notes_for_rew
r
i
t
e
()
:
Let
cal
l
er provid
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-10-21
Johan Herland
git symbolic-ref --delete $symre
f
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-10-21
Johan Herla
n
d
Fix failure to
d
elete a packed ref thro
u
gh a
s
ymref
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-10-21
Joha
n
Her
l
a
n
d
t1400-update
-
ref: Add
test
v
erifying bug with
s
ymrefs
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-03-15
Johan Her
l
and
notes
-
merge:
Don't remove
.
git/NOTES_MERGE_WORKTREE
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-03-15
Jo
h
an Herland
n
o
te
s
-
m
erge: use open
d
ir/re
a
ddir i
n
s
tead of using r
e
ad_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: i
l
lustr
a
te failur
e
to "n
o
t
e
s
merge --
c
omm
i
t
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-11-29
Joha
n
Herland
fast-im
p
ort:
F
ix incorrec
t
fanout level wh
e
n
m
odify
i
ng
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-11-29
Joha
n
Herland
t
9
3
01: Add 2nd testcas
e
exposin
g
bugs in fast-import
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-11-29
J
o
han Herland
t9301: Fix testcase cov
e
ring u
p
a bug in fast-import
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-05-13
Joha
n
H
erlan
d
t5400: Fix a couple
o
f
typos
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan
H
erla
n
d
Mark dirsta
t
e
rror messages for translation
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Im
p
rove error handling when parsing d
i
rstat param
e
ters
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
J
o
han Her
l
and
Ne
w
--dirst
a
t=lines
m
ode, doing dirstat analys
i
s
based
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan H
e
rlan
d
All
o
w specifying
-
-dirs
t
at cut-off p
e
rcentage as a
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan He
r
land
Add confi
g
varia
b
le for specifying default --dirstat
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan H
e
rland
Refa
c
t
or --
d
irstat parsing;
dep
r
ecat
e
--
c
umula
t
ive
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan
H
erland
Make -
-
dirstat=0 output director
i
es
t
hat contribute
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Jo
h
an He
r
land
A
d
d seve
r
al test
c
ases for --dir
s
t
a
t and
friends
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-12
J
ohan Herland
--dirst
a
t: In case of
r
enames, use target file
n
ame
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
J
o
han
Herland
Teach -
-
dirstat not to comple
t
ely ignore rearranged
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
--dirstat-by-fi
l
e: Make
i
t
fa
s
ter and mor
e
correct
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
--d
i
rstat: D
e
sc
r
ibe non-obvious d
i
f
f
erences rel
a
ti
v
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-03-30
J
o
han
H
e
r
l
and
Make "gi
t
not
e
s add" m
o
r
e
u
ser-fri
e
ndly when there
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-03-30
Johan Herland
lo
g
/pre
t
ty-options: Do
c
um
e
nt --[no-
]
notes and deprecate
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-02-17
Johan Herland
bra
n
ch/checkout --track: Ensure that u
p
stream br
a
nch
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-02-16
J
o
han Herl
a
nd
push
.
d
e
faul
t
:
R
ename 'tracking' t
o
'upstream'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
Provide
'
g
i
t m
e
rge --ab
o
r
t
'
as a syno
n
ym to
'
git reset
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
cmd_merge()
:
Pa
r
se options before checking MERGE_HEAD
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
and
P
rovide
'
g
it n
o
t
es get-r
e
f'
to easily retr
i
eve
c
urrent
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
land
git notes me
r
g
e
: Add tes
t
cases for merg
i
ng
notes tre
e
s
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n He
r
land
git no
t
es
mer
g
e: Add a
n
other a
u
t
o
-
resolving strategy
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
oha
n
Herland
git notes me
r
g
e: -
-
co
m
mit should fail if underlying
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herland
git
n
otes merge: List confli
c
ting n
o
tes
i
n note
s
m
e
rge
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
e
rl
a
nd
git notes
merge
:
M
a
nual conflict resolut
i
o
n, part 2/2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
r
land
git notes
m
e
r
ge: Manual c
o
nflict resol
u
tion, part
1
/2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herla
n
d
Document
a
ti
o
n: P
r
eliminary docs
o
n
'gi
t
notes merge'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
land
git
n
o
t
es
m
erge:
Add automa
t
ic confl
i
ct resolvers
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herla
n
d
git n
o
tes m
e
rge: Handle real, non-
c
o
nf
l
icting not
e
s
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
oh
a
n
H
er
l
and
bui
l
tin
/
notes
.
c
:
R
efactor creat
i
on
o
f
note
s
commits
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herlan
d
git notes merge
:
Initial implementation han
d
l
i
ng
trivial
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han
Herland
builtin/notes
.
c
:
Sp
l
i
t note
s
r
e
f
DWIMmery
into
a
sepa
r
ate
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herl
a
nd
notes
.
c: U
s
e two
newlines
(
instead of one) when concatenatin
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Herlan
d
(trivial) t330
3
: Ind
e
n
t with
tabs
i
nstea
d
o
f
spaces
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
l
a
n
d
notes
.
h/
c
: Propagate
c
ombi
n
e_not
e
s_fn return
v
alue
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
J
o
han Herland
notes
.
h
/c: Allow combi
n
e_notes functions to r
e
mov
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Joh
a
n H
e
rland
notes
.
c
:
Reord
e
r functions in
p
r
eparatio
n
f
o
r
n
e
xt
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Jo
h
an Herland
notes
.
h: Make default_n
o
tes_ref
(
)
a
vaila
b
le in n
o
tes API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Joha
n
Herland
(trivial
)
notes
.
h
:
Minor documentation fixes to c
o
py_notes()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
J
ohan Herl
a
nd
notes
.
c: He
x
ify SHA
1
in die(
)
mes
s
age from init_note
s
(
)
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-08-31
J
ohan Herland
notes:
Don'
t
cre
a
te (emp
t
y) commit when remo
v
ing
non
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-07-13
Johan
Herland
E
nable custom sc
h
emes
f
o
r
c
olumn colors in the g
r
aph API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-07-13
J
ohan Herland
Make graph
_
next_line() a
v
ailable in the grap
h
.
h API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Joh
a
n
Herland
revision: Turn off history si
m
plif
i
cati
o
n
in --ances
t
ry
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan
H
erland
r
e
vi
s
ion: Fix typo in --ances
t
ry-path e
r
ror m
e
s
sage
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan H
e
rland
Doc
u
men
t
ation
/
r
e
v-li
s
t-o
p
tions
.
t
x
t: Ex
p
lain --an
c
e
stry
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
Documentat
i
on/
r
ev-list-o
p
tion
s
.
txt:
Fix missing li
n
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-01
J
ohan H
e
rland
diff
.
c: Ensure "
i
ndex $from
.
.
$to" lin
e
contains unambiguou
s
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-25
Johan
H
e
r
land
built
i
n-notes: Mi
n
or (mostly parse_o
p
t
i
o
n
s-rela
t
ed
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-17
Johan Herl
a
nd
submodul
e
s
u
mmary:
D
o
n't
barf when invo
k
ed in an empty
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han
H
e
rland
bu
i
ltin-note
s
: Add "copy" subcommand f
o
r
copying notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
buil
t
in
-
notes: Misc
.
refactor
i
ng
of argc and exit value
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n H
e
rla
n
d
built
i
n-notes: Add -c/-C option
s
f
o
r
r
eusing n
o
t
e
s
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han
H
erla
n
d
builtin-notes
:
Refactor handling of -F option to allow
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan He
r
land
built
i
n
-notes: Depr
e
c
a
te the -m
/
-F op
t
ions
for "git
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
buil
t
i
n
-no
t
e
s
: Add "append" subcommand for
appending
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
a
n Herlan
d
builtin-notes: Add "ad
d
" subcom
m
a
nd for a
d
d
i
ng note
s
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
r
land
builtin-n
o
t
es
:
Add --mes
s
a
ge/
-
-file
aliases
f
or -
m
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
builti
n
-no
t
es: Add "list" subc
o
mmand f
o
r
li
s
t
in
g
note
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
e
rland
Docu
m
entati
o
n: Ge
n
eralize git-notes
d
ocs to 'ob
j
ects
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
builtin-notes: Ad
d
"pru
n
e" sub
c
ommand for remov
i
ng
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes
A
PI:
prune_notes
(
)
:
Prune notes that bel
o
ng to
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
t
3
305
:
Ver
i
fy tha
t
removing notes t
r
igger
s
auto
m
atic
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
builtin-n
o
t
e
s
:
Ad
d
"remove" subcommand for removing
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
Teach builtin
-
n
o
tes to
r
e
move empty not
e
s
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erla
n
d
T
each notes code
to
p
roperl
y
p
reserve non-n
o
tes
i
n
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
t33
0
5: Verify that add
i
ng
m
any no
t
es wit
h
git-notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
t3301: Verify s
u
ccess
f
u
l
annotation of no
n
-commits
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
Builtin-ify git-
n
otes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
Ref
a
ctor
notes conc
a
t
enation into a flexible
i
n
t
e
rface
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
Notes API: Allow
m
u
lti
p
l
e conc
u
rrent notes trees with
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herla
n
d
Notes API: write_
n
otes_tree
(
): Store the notes tree
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
No
t
e
s
API: for_e
a
ch_note(
)
: Tr
a
verse
the entire notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
N
otes API: get_note()
:
Return the
not
e
annotating the
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n
H
erland
Notes AP
I
: r
e
move_note(): Remov
e
note ob
j
ects from
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
No
t
es
A
PI:
a
dd_not
e
(
)
: Add note
object
s
t
o the
inter
n
a
l
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herland
N
otes
API: in
i
t_no
t
es():
Initialize
the notes tree
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Add tests fo
r
checkin
g
c
orrect
h
andling
o
f $GIT_
N
OTES_REF
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an
H
er
l
and
No
t
es A
P
I: get_commi
t
_n
o
tes(
)
-> forma
t
_
note() + remove
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Minor cosmetic
f
ixes t
o
not
e
s
.
c
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-01-26
J
oha
n
Herland
builtin-con
f
ig: Fix crash whe
n
u
s
i
n
g "-f <relative
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-07
Johan
H
erland
A
d
d
mor
e
testcase
s
to test fast-i
m
port
o
f notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-07
Johan Herland
Rename t9301 to t93
5
0, to
m
ake room
f
o
r
m
o
r
e
f
ast
-
impo
r
t
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-07
Joh
a
n Her
l
and
fast-impo
r
t: P
r
oper notes t
r
ee manipulation
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-03
Johan
H
erl
a
nd
Fix crasher on encountering
SHA1-like non-note
i
n notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-11-18
Johan
H
erlan
d
Basic build in
f
ras
t
ruct
u
re for Py
t
h
on scripts
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
A
dd selftests v
e
ri
f
y
i
n
g
c
oncatenation of
m
u
l
tiple notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Joh
a
n Herl
a
n
d
Refactor
n
o
tes code to concaten
a
te multiple notes annotating
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
Add sel
f
test
s
verifying that we can
p
ar
s
e
not
e
s t
r
ees
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
next