1. mirror
  2. git

Commits

Jonas Fonseca  committed abe549e

shortlog: do not require to run from inside a git repository

Once upon a time shortlog could be run from a non-git directory
and still do its job. Fix this regression and add a small test
for it.

Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

  • Participants
  • Parent commits 267123b
  • Branches master

Comments (0)

Files changed (3)

File builtin-shortlog.c

View file
 {
 	struct shortlog log;
 	struct rev_info rev;
+	int nongit;
 
+	prefix = setup_git_directory_gently(&nongit);
 	shortlog_init(&log);
 
 	/* since -n is a shadowed rev argument, parse our args first */
 		die ("unrecognized argument: %s", argv[1]);
 
 	/* assume HEAD if from a tty */
-	if (!rev.pending.nr && isatty(0))
+	if (!nongit && !rev.pending.nr && isatty(0))
 		add_head_to_pending(&rev);
 	if (rev.pending.nr == 0) {
 		read_from_stdin(&log);

File git.c

View file
 		{ "revert", cmd_revert, RUN_SETUP | NEED_WORK_TREE },
 		{ "rm", cmd_rm, RUN_SETUP },
 		{ "send-pack", cmd_send_pack, RUN_SETUP },
-		{ "shortlog", cmd_shortlog, RUN_SETUP | USE_PAGER },
+		{ "shortlog", cmd_shortlog, USE_PAGER },
 		{ "show-branch", cmd_show_branch, RUN_SETUP },
 		{ "show", cmd_show, RUN_SETUP | USE_PAGER },
 		{ "status", cmd_status, RUN_SETUP | NEED_WORK_TREE },

File t/t4201-shortlog.sh

View file
 
 test_expect_success 'shortlog wrapping' 'diff -u expect out'
 
+git log HEAD > log
+GIT_DIR=non-existing git shortlog -w < log > out
+
+test_expect_success 'shortlog from non-git directory' 'diff -u expect out'
+
 test_done