author | Junio C Hamano <junkio@cox.net> | |
Thu, 22 Jun 2006 08:44:54 +0000 (01:44 -0700) | ||
committer | Junio C Hamano <junkio@cox.net> | |
Thu, 22 Jun 2006 08:46:48 +0000 (01:46 -0700) | ||
commit | 5887ac821f9df614cfcf3349960523e1c36f2de7 | |
tree | f15a30476b1216885928dcb1c4cc36d155ac5a85 | tree | snapshot |
parent | 693c15dc282c36042eac8d215beae3067db7565c | commit | diff |
rebase --merge: fix for rebasing more than 7 commits.
Instead of using 4-digit numbers to name commits being rebased,
just use "cmt.$msgnum" string, with $msgnum as a decimal number
without leading zero padding. This makes it possible to rebase
more than 9999 commits, but of more practical importance is that
the earlier code used "printf" to format already formatted
$msgnum and barfed when it counted up to 0008. In other words,
the old code was incapable of rebasing more than 7 commits, and
this fixes that problem.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Instead of using 4-digit numbers to name commits being rebased,
just use "cmt.$msgnum" string, with $msgnum as a decimal number
without leading zero padding. This makes it possible to rebase
more than 9999 commits, but of more practical importance is that
the earlier code used "printf" to format already formatted
$msgnum and barfed when it counted up to 0008. In other words,
the old code was incapable of rebasing more than 7 commits, and
this fixes that problem.
Signed-off-by: Junio C Hamano <junkio@cox.net>
git-rebase.sh | diff | blob | history |