diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2007-01-30 11:07:24 -0500 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2007-01-30 11:07:24 -0500 |
| commit | 76db9dec8132d4377f6c32e4d45eb75fa0cc7a9a (patch) | |
| tree | 80a6b54d21978b5c3879662bdc4f5951f804b808 /t/t4006-diff-mode.sh | |
| parent | b715cfbba4083d25ec0d0f94e440ad734607ddb0 (diff) | |
| parent | 73a2acc0a09829f887fdf2dbcfba217102227932 (diff) | |
| download | git-76db9dec8132d4377f6c32e4d45eb75fa0cc7a9a.tar.gz git-76db9dec8132d4377f6c32e4d45eb75fa0cc7a9a.tar.xz | |
Merge branch 'master' into sp/gfi
git-fast-import requires use of inttypes.h, but the master branch has
added it to git-compat-util differently than git-fast-import originally
had used it. This merge back of master to the fast-import topic is to
get (and use) inttypes.h the way master is using it.
This is a partially evil merge to remove the call to setup_ident(),
as the master branch now contains a change which makes this implicit
and therefore removed the function declaration. (commit 01754769).
Conflicts:
git-compat-util.h
Diffstat (limited to 't/t4006-diff-mode.sh')
| -rwxr-xr-x | t/t4006-diff-mode.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t4006-diff-mode.sh b/t/t4006-diff-mode.sh index 8ad69d111..ca342f48a 100755 --- a/t/t4006-diff-mode.sh +++ b/t/t4006-diff-mode.sh @@ -15,7 +15,7 @@ test_expect_success \ tree=`git-write-tree` && echo $tree' -if [ "$(git repo-config --get core.filemode)" = false ] +if [ "$(git config --get core.filemode)" = false ] then say 'filemode disabled on the filesystem, using update-index --chmod=+x' test_expect_success \ |