summaryrefslogtreecommitdiff
path: root/mergetools/tortoisemerge
diff options
context:
space:
mode:
authorLibravatar Lukas Fleischer <git@cryptocrack.de>2013-04-07 13:53:15 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-04-07 14:45:56 -0700
commit5446e33f35d6b27b6b760a59a6ded33fbd555190 (patch)
tree6e5cd11927d1aefc4da834c0e8bd0f428dfcdcee /mergetools/tortoisemerge
parentGit 1.8.1.6 (diff)
downloadtgif-5446e33f35d6b27b6b760a59a6ded33fbd555190.tar.xz
bundle: Accept prerequisites without commit messages
While explicitly stating that the commit message in a prerequisite line is optional, we required all lines with 40 or more characters to contain a space after the object name, bailing out if a line consisted of an object name only. This was to allow bundling a history to a commit without an message, but the code forgot that it already called rtrim() to remove that whitespace. As a workaround, only check for SP when the line has more than 40 characters. Signed-off-by: Lukas Fleischer <git@cryptocrack.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'mergetools/tortoisemerge')
0 files changed, 0 insertions, 0 deletions