diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-05-25 13:13:43 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-05-25 13:13:43 -0700 |
| commit | d0b16c8f878bef5c1268e033a3d1f427498c7008 (patch) | |
| tree | 23b896e51418ea182bf6335020b5b53138398df9 /diff-no-index.c | |
| parent | 770c54170a43ffb3810088a85f25c59c0cbf7b38 (diff) | |
| parent | e498257d650529812ffe1872b3cd62e2bd604287 (diff) | |
| download | git-d0b16c8f878bef5c1268e033a3d1f427498c7008.tar.gz git-d0b16c8f878bef5c1268e033a3d1f427498c7008.tar.xz | |
Merge branch 'maint'
* maint:
Documentation/SubmittingPatches: clarify GMail section and SMTP
show-branch: use DEFAULT_ABBREV instead of 7
t7502-commit: fix spelling
test get_git_work_tree() return value for NULL
Diffstat (limited to 'diff-no-index.c')
| -rw-r--r-- | diff-no-index.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/diff-no-index.c b/diff-no-index.c index aae8e7acc..4cd9dacbe 100644 --- a/diff-no-index.c +++ b/diff-no-index.c @@ -150,16 +150,14 @@ static int queue_diff(struct diff_options *o, static int path_outside_repo(const char *path) { - /* - * We have already done setup_git_directory_gently() so we - * know we are inside a git work tree already. - */ const char *work_tree; size_t len; if (!is_absolute_path(path)) return 0; work_tree = get_git_work_tree(); + if (!work_tree) + return 1; len = strlen(work_tree); if (strncmp(path, work_tree, len) || (path[len] != '\0' && path[len] != '/')) |