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>
Jonas Fonseca committed
Mar 14, 2008 at 22:35 UTC
abe549e1791822b3105648452b1f8907f8fdb26a
3 files changed
+9
-2
builtin-shortlog.c
+3
-1
@@ -229,7 +229,9 @@ int cmd_shortlog(int argc, const char **argv, const char *prefix)
229
{
230
struct shortlog log;
231
struct rev_info rev;
232
+ int nongit;
233
234
+ prefix = setup_git_directory_gently(&nongit);
235
shortlog_init(&log);
236
237
/* since -n is a shadowed rev argument, parse our args first */
@@ -259,7 +261,7 @@ int cmd_shortlog(int argc, const char **argv, const char *prefix)
261
die ("unrecognized argument: %s", argv[1]);
262
263
/* assume HEAD if from a tty */
262
- if (!rev.pending.nr && isatty(0))
264
+ if (!nongit && !rev.pending.nr && isatty(0))
265
add_head_to_pending(&rev);
266
if (rev.pending.nr == 0) {
267
read_from_stdin(&log);
git.c
+1
-1
@@ -343,7 +343,7 @@ static void handle_internal_command(int argc, const char **argv)
343
{ "revert", cmd_revert, RUN_SETUP | NEED_WORK_TREE },
344
{ "rm", cmd_rm, RUN_SETUP },
345
{ "send-pack", cmd_send_pack, RUN_SETUP },
346
- { "shortlog", cmd_shortlog, RUN_SETUP | USE_PAGER },
346
+ { "shortlog", cmd_shortlog, USE_PAGER },
347
{ "show-branch", cmd_show_branch, RUN_SETUP },
348
{ "show", cmd_show, RUN_SETUP | USE_PAGER },
349
{ "status", cmd_status, RUN_SETUP | NEED_WORK_TREE },
t/t4201-shortlog.sh
+5
@@ -47,4 +47,9 @@ EOF
47
48
test_expect_success 'shortlog wrapping' 'diff -u expect out'
49
50
+git log HEAD > log
51
+GIT_DIR=non-existing git shortlog -w < log > out
52
+
53
+test_expect_success 'shortlog from non-git directory' 'diff -u expect out'
54
+
55
test_done