Skip to main content

Browse the archive

Revision dc342a25d1b48cb53448fe0e5dde578edce3122c authored by Jonathan Nieder on 24 January 2013, 23:21:46 UTC, committed by Junio C Hamano on 25 January 2013, 18:41:49 UTC 
ident: do not drop username when reading from /etc/mailname
 
An earlier conversion from fgets() to strbuf_getline() in the
codepath to read from /etc/mailname to learn the default host-part
of the ident e-mail address forgot that strbuf_getline() stores the
line at the beginning of the buffer just like fgets().

The "username@" the caller has prepared in the strbuf, expecting the
function to append the host-part to it, was lost because of this.

Reported-by: Mihai Rusu <dizzy@google.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Acked-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 7e20105
Raw File
t3004-ls-files-basic.sh 
#!/bin/sh

test_description='basic ls-files tests

This test runs git ls-files with various unusual or malformed
command-line arguments.
'

. ./test-lib.sh

>empty

test_expect_success 'ls-files in empty repository' '
	git ls-files >actual &&
	test_cmp empty actual
'

test_expect_success 'ls-files with nonexistent path' '
	git ls-files doesnotexist >actual &&
	test_cmp empty actual
'

test_expect_success 'ls-files with nonsense option' '
	test_expect_code 129 git ls-files --nonsense 2>actual &&
	grep "[Uu]sage: git ls-files" actual
'

test_expect_success 'ls-files -h in corrupt repository' '
	mkdir broken &&
	(
		cd broken &&
		git init &&
		>.git/index &&
		test_expect_code 129 git ls-files -h >usage 2>&1
	) &&
	grep "[Uu]sage: git ls-files " broken/usage
'

test_done
back to top