diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-04-18 19:33:38 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-04-18 19:33:38 -0700 |
| commit | 2de00bf9e8815970c61cefaef35efeacd8a7d6de (patch) | |
| tree | 3a9f5d3948d4716c12efaadfeef4c5de10a9dec6 /convert-objects.c | |
| parent | 6fb8e8f401a065bdffe379764871551e37a041a0 (diff) | |
| parent | 6e6db39afc305e1205a4d2dcf34680bfa80bfc24 (diff) | |
| download | git-2de00bf9e8815970c61cefaef35efeacd8a7d6de.tar.xz | |
Merge branch 'maint'
* maint:
fix up strtoul_ui error handling
git-tar-tree: complete deprecation conversion message
Diffstat (limited to 'convert-objects.c')
| -rw-r--r-- | convert-objects.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/convert-objects.c b/convert-objects.c index cf03bcfe5a..cefbcebdca 100644 --- a/convert-objects.c +++ b/convert-objects.c @@ -88,7 +88,7 @@ static int write_subdirectory(void *buffer, unsigned long size, const char *base unsigned int mode; char *slash, *origpath; - if (!path || strtoul_ui(buffer, 8, &mode) != 1) + if (!path || strtoul_ui(buffer, 8, &mode)) die("bad tree conversion"); mode = convert_mode(mode); path++; |