diff options
| author |  Junio C Hamano <junkio@cox.net> | 2007-02-25 19:10:13 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-02-25 19:10:13 -0800 |
| commit | 5569dad48e22e7b373ce3ffcc32758163bbd7b42 (patch) | |
| tree | 1b263acc52608ae716096abfba527f8b58b3e750 /merge-index.c | |
| parent | diff --cached: give more sensible error message when HEAD is yet to be created. (diff) | |
| parent | Merge branch 'jc/merge-symlink' into maint (diff) | |
| download | tgif-5569dad48e22e7b373ce3ffcc32758163bbd7b42.tar.xz | |
Merge branch 'maint'
* maint:
merge-recursive: fix longstanding bug in merging symlinks
merge-index: fix longstanding bug in merging symlinks
Diffstat (limited to 'merge-index.c')
| -rw-r--r-- | merge-index.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/merge-index.c b/merge-index.c index a9983dd78a..7027d78659 100644 --- a/merge-index.c +++ b/merge-index.c @@ -60,7 +60,7 @@ static int merge_entry(int pos, const char *path) break; found++; strcpy(hexbuf[stage], sha1_to_hex(ce->sha1)); - sprintf(ownbuf[stage], "%o", ntohl(ce->ce_mode) & (~S_IFMT)); + sprintf(ownbuf[stage], "%o", ntohl(ce->ce_mode)); arguments[stage] = hexbuf[stage]; arguments[stage + 4] = ownbuf[stage]; } while (++pos < active_nr); |