aboutsummaryrefslogtreecommitdiff
path: root/builtin-apply.c
diff options
context:
space:
mode:
authorShawn O. Pearce <spearce@spearce.org>2008-10-09 10:18:32 -0700
committerShawn O. Pearce <spearce@spearce.org>2008-10-09 10:18:32 -0700
commit635536488c3efcf8495333b6a94e3e33c36fc055 (patch)
treedbe59109f95a57e008933d56ab28e72c7ae410ec /builtin-apply.c
parent749bc58c5eab5b6947d2c01e02d12320005eba99 (diff)
parent44c33a5b9603fba7c9556512a72e4e392ba4ae2d (diff)
downloadgit-635536488c3efcf8495333b6a94e3e33c36fc055.tar.gz
git-635536488c3efcf8495333b6a94e3e33c36fc055.tar.xz
Merge branch 'maint'
* maint: builtin-apply: fix typo leading to stack corruption git-stash.sh: fix flawed fix of invalid ref handling (commit da65e7c1) builtin-merge.c: allocate correct amount of memory Makefile: do not set NEEDS_LIBICONV for Solaris 8 rebase -i: remove leftover debugging rebase -i: proper prepare-commit-msg hook argument when squashing
Diffstat (limited to 'builtin-apply.c')
-rw-r--r--builtin-apply.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-apply.c b/builtin-apply.c
index 342f2fe5e..bf8061050 100644
--- a/builtin-apply.c
+++ b/builtin-apply.c
@@ -1697,7 +1697,7 @@ static int match_fragment(struct image *img,
fixlen = ws_fix_copy(buf, orig, oldlen, ws_rule, NULL);
/* Try fixing the line in the target */
- if (sizeof(tgtfixbuf) < tgtlen)
+ if (sizeof(tgtfixbuf) > tgtlen)
tgtfix = tgtfixbuf;
else
tgtfix = xmalloc(tgtlen);