diff options
| author | Jiang Xin <worldhello.net@gmail.com> | 2012-04-28 20:30:50 +0800 |
|---|---|---|
| committer | Jiang Xin <worldhello.net@gmail.com> | 2012-04-28 20:30:50 +0800 |
| commit | b240ea25a97d1b96acc4d0f5ae0dbcbe9e0af860 (patch) | |
| tree | da951e1c145cc094a6e5d634141f03b809bf3aff /builtin/diff.c | |
| parent | 01b127cdc5d596a3022d834d82f883822c7f166b (diff) | |
| parent | 868d662399786462f87df45c3d68bd5390311a6e (diff) | |
| download | git-b240ea25a97d1b96acc4d0f5ae0dbcbe9e0af860.tar.gz git-b240ea25a97d1b96acc4d0f5ae0dbcbe9e0af860.tar.xz | |
Merge maint branch for tracking l10n updates of git stable version
Use master branch to track l10n updates for git next release, while
use maint branch to track l10n updates for git stable version.
Diffstat (limited to 'builtin/diff.c')
| -rw-r--r-- | builtin/diff.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/diff.c b/builtin/diff.c index 424c815f9..9069dc41b 100644 --- a/builtin/diff.c +++ b/builtin/diff.c @@ -327,7 +327,7 @@ int cmd_diff(int argc, const char **argv, const char *prefix) add_head_to_pending(&rev); if (!rev.pending.nr) { struct tree *tree; - tree = lookup_tree((const unsigned char*)EMPTY_TREE_SHA1_BIN); + tree = lookup_tree(EMPTY_TREE_SHA1_BIN); add_pending_object(&rev, &tree->object, "HEAD"); } break; |