repo.or.cz
/
alt-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'jt/has_object'
2020-08-03
E
lijah Newren
ch
e
ckout: su
p
port renorm
a
lization with che
c
kout -m
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-08-03
Elijah Newren
m
e
r
g
e
: mak
e
merge
.
r
e
norma
l
ize work for all uses of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-08-03
Elijah New
r
e
n
t6038: remove probl
e
m
ati
c
test
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-08-03
Elijah N
e
wr
e
n
t6038: mak
e
tests
fail for the right re
a
son
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-08-02
Eli
j
ah Newren
merge-r
e
c
u
rsive:
fix
unc
l
ear and outri
g
ht wrong commen
t
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-07-28
Elijah New
r
en
hashmap:
fi
x
typo i
n
usage docs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-07-28
Elijah Newren
Re
m
ove d
o
ubled
w
ords
i
n
va
r
io
u
s
comments
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-06-22
Elijah
N
ewren
g
it-p
r
ompt: include s
p
arsity
s
tate as well
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-06-22
Elijah Newren
git-prompt: document how
in-
p
r
o
gress operation
s
affect
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-06-18
Elij
a
h Newr
e
n
wt-status: show spars
e
checkout status as
well
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-06-13
El
i
jah New
r
en
clean: optimiz
e
and document ca
s
es wh
e
re
w
e recurse
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-06-13
Elijah Newre
n
clean:
c
on
s
olid
a
te hand
l
ing
o
f ignored parame
t
ers
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-06-13
E
l
ijah New
r
en
dir, clean: avoid disallowed
behavior
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-06-13
Elijah
N
ewren
di
r
:
fi
x
a fe
w
confusing comments
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-06-13
El
i
j
a
h Newren
git-sparse
-
checkout: clarify int
e
r
actio
n
s
with submodu
l
es
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-06-05
Elij
a
h
Newren
dir: f
i
x treatmen
t
of negated path
s
pecs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-06-05
Elijah Newre
n
sparse-ch
e
ckout
:
av
o
id
s
t
a
ging del
e
tions o
f
all fi
l
e
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-05-31
Elij
a
h New
r
e
n
f
ast-i
m
p
ort: add new
-
-date-form
a
t=raw-
p
e
rmissive
f
or
m
at
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-05-15
Elijah New
r
en
unpack-tree
s
:
also allo
w
ge
t
_progr
e
ss() t
o
work on
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-05-14
Elijah Newr
e
n
merge-recurs
i
ve: fix rename/ren
a
me(1
t
o2) for working
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-04-27
Elijah Newren
rebase:
d
i
splay an
er
r
or
i
f --root an
d
-
-
fork-po
i
nt
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-04-11
Eli
j
ah Newren
rebase: fix
an incompatible-options error message
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-04-11
Elijah Newr
e
n
r
e
b
a
s
e
: reinstate -
-
no-k
e
ep-empty
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-04-11
Elijah Ne
w
ren
rebase
-
i:
mark commits that
begin empty in to
d
o
e
ditor
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-04-07
E
lija
h
Newren
sequence
r
: honor GIT_REFLOG_ACTION
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-04-05
Elija
h
Newren
git-rebase
.
t
xt: add anot
h
er hook to the hooks section
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-04-01
Eli
j
ah Newren
complet
i
on
:
fi
x
'git
a
dd'
o
n paths under
a
n untracked
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-04-01
Elijah Newren
F
i
x error-prone fil
l
_directory() API
;
make
it onl
y
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-04-01
Elij
a
h Newren
dir: repla
c
e do
u
ble pathspec ma
t
ching with single
in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-04-01
Elij
a
h Newren
dir
:
i
n
c
l
u
d
e DIR_KEEP_U
N
T
R
ACKED_
C
ONTENTS han
d
ling in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-04-01
E
l
ijah
N
ewren
d
i
r: replace exp
o
nential algo
r
i
thm with a
l
i
n
ear one
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-04-01
Elijah Newren
dir: fix confusion ba
s
ed on variable ten
s
e
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-04-01
E
li
j
ah New
r
en
dir: fix broken
c
ommen
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-04-01
Eli
j
ah Newren
dir:
c
o
nsolidate treat_path() and treat_one_path(
)
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-04-01
Elijah N
e
wr
e
n
d
ir: f
i
x simple typo in comment
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-04-01
Elijah Newren
t
3
00
0
: add more test
c
ases testing a
va
r
i
ety of ls-files
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-04-01
Elijah Newren
t7
0
6
3: mor
e
thorou
g
h
s
t
a
t
us che
c
king
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-03-27
Elijah New
r
e
n
p
u
ll:
a
void runn
i
ng both
merge and rebase
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-03-27
Elijah Newren
spa
r
se-ch
e
cko
u
t: provide a new reapply subcomm
a
nd
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-03-27
Elijah Newren
un
p
ack
-
tre
e
s:
fail
u
re
t
o s
e
t
SKIP_WORKTR
E
E
bits
a
lways
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-03-27
Eli
j
a
h
Newren
unpack-tr
e
es: provide
w
arnings on sparse updates
f
o
r
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-03-27
Elijah Newren
unpack-t
r
ees: make
s
p
arse
p
ath me
s
s
a
ges sound like
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-03-27
Elijah Newren
unpac
k
-trees:
split displa
y
_
error_msg
s
() into two
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-03-27
Elijah Ne
w
ren
unpack-trees: rename
E
RROR_* fields mea
n
t f
o
r w
a
r
n
ings
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-03-27
Eli
j
ah Newren
unpack-trees: move ERROR_WOULD_LOSE_SUBMODULE earl
i
er
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-03-27
E
l
ijah Newren
spars
e
-checko
u
t
: us
e
improve
d
u
n
p
a
ck_trees porcelain
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-03-27
Eli
j
a
h
Newren
sparse-
c
h
e
c
ko
u
t: use new up
d
ate_spars
i
t
y() fun
c
tio
n
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-03-27
Elij
a
h
N
ew
r
en
unpack-tr
e
es: add
a new update_spa
r
sity(
)
fu
n
ction
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-03-27
Eli
j
ah Newren
u
n
p
a
ck-trees: pul
l
sparse
-
checkout
p
atter
n
rea
d
ing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-03-27
Elijah Newren
unp
a
ck-tree
s
: do not mar
k
a dirty path wi
t
h SKIP_WORKTREE
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-03-27
Elijah Newren
unp
a
ck-trees: allow
c
he
c
k_u
p
d
a
t
es(
)
to wo
r
k on a differ
e
nt
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-03-27
El
i
jah Newren
t1091
:
make some tests a littl
e
mor
e
defensive aga
i
nst
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-03-27
E
lij
a
h N
e
wren
un
p
a
c
k-
t
rees: simplify pattern
_
l
ist freeing
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-03-27
Elijah Newren
unpack-tr
e
es: simplify verify_abse
n
t_s
p
arse()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-03-27
Elijah Newren
unpack-trees: remov
e
unused error type
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-03-27
Eli
j
ah Ne
w
ren
unpack
-
trees: fix m
i
no
r
ty
p
o in comme
n
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-03-18
Elijah
Newren
R
e
l
N
otes/2
.
26
.
0: fix various typos
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-03-15
Elij
a
h Newren
oidset: remove unnec
e
ss
a
ry include
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-03-13
E
l
ijah Ne
w
ren
t6022, t6
0
46:
fix flaky f
i
l
e
s-are-updated
c
hecks
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-03-11
Elijah Newr
e
n
git-reba
s
e
.
tx
t
: hi
g
hlight backend d
i
f
f
e
rences with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-03-11
Elijah Newre
n
s
equencer:
c
l
e
ar state upon droppin
g
a beco
m
e
-
e
mpt
y
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-02-27
Elijah Newren
t
6020: new
t
est w
i
t
h
i
n
t
e
r
l
eaved le
x
icogra
p
hic o
r
deri
n
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-02-27
Elijah
New
r
en
t6022, t6046: test expected behav
i
or instead of tes
t
i
n
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-02-27
Elijah
Newren
t
3
035: prefer test_must_fail to bash negation f
o
r git
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-02-27
Elijah Newren
t6020, t6022, t6035: update m
e
rge tests t
o
use tes
t
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-02-27
Elijah
Newren
t602[1236], t6034:
mode
r
nize test for
m
at
t
ing
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-02-27
E
lijah
N
ewren
merge
-
recu
r
si
v
e: apply collision handling u
n
ification
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-02-19
Eli
j
a
h
Ne
w
ren
m
e
rge-recur
s
ive: fix the refresh log
i
c
i
n update
_
file_flags
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-02-19
El
i
jah
N
ewren
t3433
:
new rebase
testcase documenting a stat-dirty
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-02-18
Elij
a
h
N
ewren
check-ignor
e
: fix do
c
umenta
t
ion and implementati
o
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-02-16
Elijah Newre
n
re
b
ase: rename the
t
w
o pr
i
ma
r
y rebase backends
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-02-16
Elija
h
Newren
rebase: change the defaul
t
backend from "am" to "merge"
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-02-16
Elijah Newren
re
b
a
s
e: make the backe
n
d configu
r
able via con
f
i
g
s
etting
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-02-16
Elijah Newre
n
rebase t
e
sts: repeat some te
s
ts usi
n
g t
h
e m
e
rge
b
a
ck
e
nd
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-02-16
Elijah Newren
reba
s
e te
s
ts: mark tests specific to the am-backen
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-02-16
Elijah Newren
rebas
e
: d
r
o
p '-i' from th
e
reflog fo
r
interactive-based
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-02-16
Elijah Newr
e
n
git-prompt: change the prompt for inte
r
active-based
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-02-16
Elijah
N
e
wren
rebase: add an --am option
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-02-16
E
l
ijah Newren
r
e
base
:
move incom
p
a
t
ibility check
s
between ba
c
kend
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-02-16
Elijah Newren
git-rebase
.
txt
:
add more de
t
a
i
l
s ab
o
u
t
behavioral
d
ifference
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-02-16
Elijah
Newren
reb
a
s
e
: allow more types o
f
rebases to fas
t
-forward
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-02-16
Elijah N
e
wren
t3432: m
a
ke these tests
work with either am or merge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-02-16
Elijah Newren
rebase: f
i
x ha
n
d
l
i
ng of restrict_revision
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-02-16
Elijah
Ne
w
ren
rebase: make sure to pass a
l
ong
the quiet flag to the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-02-16
E
lijah Newren
rebase, sequencer
:
re
m
ov
e
th
e
broken GIT_QUIET handlin
g
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-02-16
Eli
j
ah Newr
e
n
t3406: simplify an alre
a
dy simp
l
e test
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-02-16
Elijah New
r
en
reb
a
se (intera
c
t
ive-backend): fix handling of commits
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-02-16
Elijah Newren
rebase (interacti
v
e-ba
c
kend):
m
ake --k
e
ep-empty the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-01-17
Elija
h
Newre
n
t3404:
directly test the
beh
a
vior
of
i
nterest
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-01-17
E
l
ij
a
h Newren
git-reb
a
se
.
txt:
u
p
date
des
c
ription of --al
l
ow-empty
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-01-16
Eli
j
a
h Newren
dir: tre
a
t_leading_path() and r
e
ad
_
directory_recursive
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-01-07
Elijah Newren
string-lis
t
: note in docs that callers can specif
y
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-01-07
Elijah
N
ewren
u
n
pack-tre
e
s: exit chec
k
_
u
pd
a
t
e
s
() earl
y
if up
d
ates
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-01-02
Elijah N
e
wr
e
n
merge-re
c
ursive: remove un
n
ecessary oi
d
_eq function
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-12-20
Elijah N
e
wren
re
b
a
s
e: f
i
x saving of --signoff state for am-
b
ased
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-12-19
E
l
ij
a
h N
e
wren
di
r
: consolidate
sim
i
lar c
o
d
e
in tr
e
a
t
_directory()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-12-19
E
l
ijah Newren
dir: synchronize treat_
l
e
a
ding_path() and read_
d
irecto
r
y
_
r
ec
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-12-19
E
lijah N
e
w
r
en
dir: fix checks on
c
ommon
pref
i
x directory
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-12-18
El
i
j
a
h New
r
e
n
t
3434:
m
ark successful
t
e
s
t a
s
such
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-12-11
E
li
j
ah Newren
dir: break part o
f
read_dire
c
tory
_
recursi
v
e
(
) out for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next