git, branch v1.5.5.6Fork of git SCM with my patches.http://git.kilabit.info/git/atom?h=v1.5.5.62008-12-17T06:08:28ZGIT 1.5.5.62008-12-17T06:08:28ZJunio C Hamanogitster@pobox.com2008-12-17T06:08:22Zurn:sha1:f23ffbe890d36e277f02d4a84c2b52de3a4e3173
Signed-off-by: Junio C Hamano <gitster@pobox.com>
GIT 1.5.4.72008-12-17T06:06:47ZJunio C Hamanogitster@pobox.com2008-12-17T06:03:29Zurn:sha1:34b146c0f444fc9f83bea3215bd0cd546fc57c33
Signed-off-by: Junio C Hamano <gitster@pobox.com>
gitweb: do not run "git diff" that is Porcelain2008-12-17T05:54:44ZJunio C Hamanogitster@pobox.com2008-12-17T03:42:02Zurn:sha1:dfff4b7aa42de7e7d58caeebe2c6128449f09b76
Jakub says that legacy-style URI to view two blob differences are never
generated since 1.4.3. This codepath runs "git diff" Porcelain from the
gitweb, which is a no-no. It can trigger diff.external command that is
specified in the configuration file of the repository being viewed.
This patch applies to v1.5.4 and later.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
GIT 1.5.5.52008-06-27T00:59:51ZJunio C Hamanogitster@pobox.com2008-06-27T00:16:50Zurn:sha1:006f31d77f3dd5f813557c2839b39b2aaa22b925
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Merge branch 'maint-1.5.4' into maint-1.5.52008-06-27T00:14:03ZJunio C Hamanogitster@pobox.com2008-06-27T00:14:03Zurn:sha1:53b22a9e45161004ff3260782abc4ee2a5b3e730
* maint-1.5.4:
GIT 1.5.4.6
git-shell: accept "git foo" form
Conflicts:
GIT-VERSION-GEN
RelNotes
GIT 1.5.4.62008-06-27T00:11:21ZJunio C Hamanogitster@pobox.com2008-06-27T00:11:21Zurn:sha1:872354dcb3ce5f34f7ddb12d2c89d26a1ea4daf0
Signed-off-by: Junio C Hamano <gitster@pobox.com>
git-shell: accept "git foo" form2008-06-26T23:51:23ZJunio C Hamanogitster@pobox.com2007-12-02T06:16:19Zurn:sha1:bc7c73e29cfb38232b5b6b1d1e8d59e7145a9860
This is a backport of 0a47dc110e042b5bcc63dc94c8d517e67efe9306
to 'maint' to be included in 1.5.6.2 so that older server side
can accept dashless form of request when clients are updated.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
diff.c: fix emit_line() again not to add extra line2008-06-17T00:37:21ZJunio C Hamanogitster@pobox.com2008-06-17T00:37:21Zurn:sha1:4afbcab9898ce63ad641dd0de6e9b69deda44330
Signed-off-by: Junio C Hamano <gitster@pobox.com>
diff: reset color before printing newline2008-06-16T22:22:09ZSZEDER Gáborszeder@ira.uka.de2008-06-16T22:00:02Zurn:sha1:06ff64ae3d8c1d446ff61cff78a8faa3a07bfe24
It worked that way since commit 50f575fc (Tweak diff colors,
2006-06-22), but commit c1795bb0 (Unify whitespace checking, 2007-12-13)
changed it. This patch restores the old behaviour.
Besides Linus' arguments in the log message of 50f575fc, resetting color
before printing newline is also important to keep 'git add --patch'
happy. If the last line(s) of a file are removed, then that hunk will
end with a colored line. However, if the newline comes before the color
reset, then the diff output will have an additional line at the end
containing only the reset sequence. This causes trouble in
git-add--interactive.perl's parse_diff function, because @colored will
have one more element than @diff, and that last element will contain the
color reset. The elements of these arrays will then be copied to @hunk,
but only as many as the number of elements in @diff. As a result the
last color reset is lost and all subsequent terminal output will be
printed in color.
Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
fix typo in tutorial2008-06-11T23:21:45ZFred Maranhãofred.maranhao@gmail.com2008-06-11T23:09:48Zurn:sha1:2feaf4e977c5e7392ef42689b34d60c4d2f40f4f
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>