git/diff.c, branch v1.7.0.5Mirror of https://git.kernel.org/pub/scm/git/git.git/
https://www.git.shady.money/git/atom?h=v1.7.0.52010-04-10T05:38:34ZMerge branch 'jc/conflict-marker-size' into maint2010-04-10T05:38:34ZJunio C Hamanogitster@pobox.com2010-04-10T05:38:34Zurn:sha1:daaf2e8892cf3b652454c48ffd332e3c5b446b92
* jc/conflict-marker-size:
diff --check: honor conflict-marker-size attribute
diff: fix textconv error zombies2010-03-30T21:46:33ZJohannes Sixtj6t@kdbg.org2010-03-30T17:36:03Zurn:sha1:da1fbed3fff6ed2d64399ff26d8a9ab3bcf00540
To make the code simpler, run_textconv lumps all of its
error checking into one conditional. However, the
short-circuit means that an error in reading will prevent us
from calling finish_command, leaving a zombie child.
Clean up properly after errors.
Based-on-work-by: Jeff King <peff@peff.net>
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
diff --check: honor conflict-marker-size attribute2010-03-25T02:35:34ZJunio C Hamanogitster@pobox.com2010-03-25T02:21:32Zurn:sha1:a757c646ee78ae21c9e8ac66dcc52e361c15c7d2
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Merge branch 'ld/maint-diff-quiet-w' into maint2010-03-05T06:26:39ZJunio C Hamanogitster@pobox.com2010-03-05T06:26:39Zurn:sha1:8cc3709df0e4f8e4f2aca6ae68b5b4f145787252
* ld/maint-diff-quiet-w:
git-diff: add a test for git diff --quiet -w
git diff --quiet -w: check and report the status
Merge branch 'jc/typo' into maint2010-02-17T22:55:09ZJunio C Hamanogitster@pobox.com2010-02-17T22:55:09Zurn:sha1:07cb9a369e12633e1e43e0acded32885592a455c
* jc/typo:
Typofixes outside documentation area
Merge branch 'maint-1.6.6' into maint2010-02-16T23:05:02ZJunio C Hamanogitster@pobox.com2010-02-16T23:05:02Zurn:sha1:e7b3cea0f7589c57f7bb808330e32bdd7f901c95
* maint-1.6.6:
dwim_ref: fix dangling symref warning
stash pop: remove 'apply' options during 'drop' invocation
diff: make sure --output=/bad/path is caught
Remove hyphen from "git-command" in two error messages
Merge branch 'maint-1.6.5' into maint-1.6.62010-02-16T23:04:55ZJunio C Hamanogitster@pobox.com2010-02-16T23:04:55Zurn:sha1:eb0bcd0fbe34befe7648a398efc7f4156b07da48
* maint-1.6.5:
dwim_ref: fix dangling symref warning
stash pop: remove 'apply' options during 'drop' invocation
diff: make sure --output=/bad/path is caught
git diff --quiet -w: check and report the status2010-02-16T07:04:34ZLarry D'Annalarry@elder-gods.org2010-02-16T06:55:21Zurn:sha1:6977c250ac6cacb5ee441bff832fdeab4d0cd8f9
The option -w tells the diff machinery to inspect the contents to set the
exit status, instead of checking the blob object level difference alone.
However, --quiet tells the diff machinery not to look at the contents, which
means DIFF_FROM_CONTENTS has no chance to inspect the change.
Work it around by calling diff_flush_patch() with output sent to /dev/null.
Signed-off-by: Larry D'Anna <larry@elder-gods.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
diff: make sure --output=/bad/path is caught2010-02-16T05:46:01ZLarry D'Annalarry@elder-gods.org2010-02-16T04:10:45Zurn:sha1:8324b977aef3d2301f170e23f498b50e11302575
The return value from fopen wasn't being checked.
Signed-off-by: Larry D'Anna <larry@elder-gods.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Typofixes outside documentation area2010-02-04T05:28:17ZJunio C Hamanogitster@pobox.com2010-02-04T05:23:18Zurn:sha1:9517e6b84357252e1882091343661c34d978771e
begining -> beginning
canonicalizations -> canonicalization
comand -> command
dewrapping -> unwrapping
dirtyness -> dirtiness
DISCLAMER -> DISCLAIMER
explicitely -> explicitly
feeded -> fed
impiled -> implied
madatory -> mandatory
mimick -> mimic
preceeding -> preceding
reqeuest -> request
substition -> substitution
Signed-off-by: Junio C Hamano <gitster@pobox.com>