Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
t4211: fix incorrect rebase at f8395edc (range-set: satisfy non-empty ranges invariant)
author
Junio C Hamano
<gitster@pobox.com>
Wed, 24 Jul 2013 14:53:25 +0000
(07:53 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Wed, 24 Jul 2013 14:53:25 +0000
(07:53 -0700)
Wnen I rewrote "cat b.c | wc -l" into "wc -l <b.c" to squash in a
suggestion on the list to this series, I screwed up subsequent
rebase. Fix it up.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t4211-line-log.sh
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
efc5e5e
)
diff --git
a/t/t4211-line-log.sh
b/t/t4211-line-log.sh
index 00a850d61166aae6caaa61385b826cba73519b90..7665d6785c1a91ed0171e8cac61174ebee9b9a37 100755
(executable)
--- a/
t/t4211-line-log.sh
+++ b/
t/t4211-line-log.sh
@@
-68,7
+68,6
@@
test_bad_opts "-L :foo:b.c" "no match"
# thus to demonstrate this particular bug, the empty -L range must follow a
# non-empty -L range.
test_expect_success '-L {empty-range} (any -L)' '
- n=$(expr $(cat b.c | wc -l) + 1) &&
n=$(expr $(wc -l <b.c) + 1) &&
git log -L1,1:b.c -L$n:b.c
'