aboutsummaryrefslogtreecommitdiffstats
path: root/builtin/commit-graph.c
diff options
context:
space:
mode:
Diffstat (limited to 'builtin/commit-graph.c')
0 files changed, 0 insertions, 0 deletions
>ls-tree manpage: output of ls-tree is compatible with update-indexAlex Riesen1-0/+2 Such format relationships are very useful things to remember for script writers. Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2009-05-10ls-tree manpage: use "unless" instead of "when ... is not"Alex Riesen1-1/+1 Delayed negation in a statement is harder to spot and keep in mind. Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2009-05-05improve error message in config.cAlex Riesen1-1/+1 Show errno if opening a lockfile fails. Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2009-05-05t4018-diff-funcname: add cpp xfuncname pattern to syntax testBrandon Casey1-1/+1 Signed-off-by: Brandon Casey <drafnel@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2009-05-05Work around BSD whose typeof(tv.tv_sec) != time_tBernd Ahlers1-1/+3 According to POSIX, tv_sec is supposed to be a time_t, but OpenBSD (and FreeBSD, too) defines it to be a long, which triggers a type mismatch when a pointer to it is given to localtime_r(). Acked-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2009-05-05git-am.txt: reword extra headers in message bodyStephen Boyd1-4/+4 Signed-off-by: Stephen Boyd <bebarino@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2009-05-05git-am.txt: Use date or value instead of time or timestampStephen Boyd1-4/+4 Signed-off-by: Stephen Boyd <bebarino@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2009-05-05git-am.txt: add an 'a', say what 'it' is, simplify a sentenceStephen Boyd1-6/+6 It's nice to know that 'it' is git-am or the subject line. Whitespace implies characters so just remove characters. Signed-off-by: Stephen Boyd <bebarino@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2009-05-05dir.c: Fix two minor grammatical errors in commentsAllan Caffee1-2/+2 Signed-off-by: Allan Caffee <allan.caffee@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2009-05-05git-svn: fix a sloppy Getopt::Long usageRobin H. Johnson1-1/+1 Getopt-Long v2.38 is much stricter about sloppy getopt usage. The trailing pipe causes git-svn testcases to fail for all of the --stdin argument calls. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2009-05-03GIT 1.6.2.5v1.6.2.5Junio C Hamano3-2/+23 Signed-off-by: Junio C Hamano <gitster@pobox.com> 2009-05-03GIT 1.6.1.4v1.6.1.4Junio C Hamano2-1/+26 With a handful of fixes backmerged from 1.6.2.X series Signed-off-by: Junio C Hamano <gitster@pobox.com> 2009-05-01honor repack.usedeltabaseoffset when fetching packsNicolas Pitre1-1/+12 If the local receiving repository has disabled the use of delta base offset, for example to retain compatibility with older versions of Git that predate OFS_DELTA, we shouldn't ask for ofs-delta support when we obtain a pack from the remote server. [ issue noticed by Shawn Pearce ] Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2009-04-29diff -c -p: do not die on submodulesJunio C Hamano2-12/+65 The combine diff logic knew only about blobs (and their checked-out form in the work tree, either regular files or symlinks), and barfed when fed submodules. This "externalizes" gitlinks in the same way as the normal patch generation codepath does (i.e. "Subproject commit Xxx\n") to fix the issue. Signed-off-by: Junio C Hamano <gitster@pobox.com> 2009-04-27grep: fix segfault when "git grep '('" is givenLinus Torvalds2-2/+10 Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2009-04-27Documentation: fix a grammatical error in api-builtin.txtAllan Caffee1-1/+1 Signed-off-by: Allan Caffee <allan.caffee@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2009-04-27builtin-merge: fix a typo in an error messageAllan Caffee1-1/+1 Signed-off-by: Allan Caffee <allan.caffee@gmail.com> Acked-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2009-04-23test-genrandom: Add newline to usage stringStephen Boyd1-1/+1 A minor fix to place the terminal input on a new line if test-genrandom is run with no arguments. Signed-off-by: Stephen Boyd <bebarino@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2009-04-20tests: make test-apply-criss-cross-rename more robustMichał Kiedrowicz1-3/+31 I realized that this test does check if git-apply succeeds, but doesn't tell if it applies patches correctly. So I added test_cmp to check it. I also added a test which checks swapping three files. Signed-off-by: Junio C Hamano <gitster@pobox.com> 2009-04-20builtin-apply: keep information about files to be deletedMichał Kiedrowicz2-8/+47 Example correct diff generated by `diff -M -B' might look like this: diff --git a/file1 b/file2 similarity index 100% rename from file1 rename to file2 diff --git a/file2 b/file1 similarity index 100% rename from file2 rename to file1 Information about removing `file2' comes after information about creation of new `file2' (renamed from `file1'). Existing implementation isn't able to apply such patch, because it has to know in advance which files will be removed. This patch populates fn_table with information about removal of files before calling check_patch() for each patch to be applied. Signed-off-by: Michał Kiedrowicz <michal.kiedrowicz@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>