diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-02-17 16:16:48 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-02-17 16:16:48 -0800 |
| commit | 69bc0e22d37db4fa9875b717a64949bbfce4ebdf (patch) | |
| tree | adc790d89c9875d027fd996f402d05a40b0298bb /builtin-apply.c | |
| parent | name-rev: introduce the --refs=<pattern> option (diff) | |
| parent | Update draft release notes for 1.5.0.1 (diff) | |
| download | git-69bc0e22d37db4fa9875b717a64949bbfce4ebdf.tar.gz git-69bc0e22d37db4fa9875b717a64949bbfce4ebdf.zip | |
Merge branch 'maint'
* maint:
Update draft release notes for 1.5.0.1
Convert update-index references in docs to add.
Attempt to improve git-rebase lead-in description.
Do not take mode bits from index after type change.
git-blame: prevent argument parsing segfault
Make gitk save and restore window pane position on Linux and Cygwin.
Make gitk save and restore the user set window position.
[PATCH] gitk: Use show-ref instead of ls-remote
[PATCH] Make gitk work reasonably well on Cygwin.
[PATCH] gitk - remove trailing whitespace from a few lines.
Change git repo-config to git config
Diffstat (limited to 'builtin-apply.c')
| -rw-r--r-- | builtin-apply.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-apply.c b/builtin-apply.c index 3fefdacd94..abe3538715 100644 --- a/builtin-apply.c +++ b/builtin-apply.c @@ -1988,7 +1988,7 @@ static int check_patch(struct patch *patch, struct patch *prev_patch) return error("%s: %s", old_name, strerror(errno)); if (!cached) - st_mode = ntohl(create_ce_mode(st.st_mode)); + st_mode = ntohl(ce_mode_from_stat(ce, st.st_mode)); if (patch->is_new < 0) patch->is_new = 0; |