aboutsummaryrefslogtreecommitdiffstats
path: root/builtin/commit.c
diff options
context:
space:
mode:
authorPratyush Yadav <me@yadavpratyush.com>2020-02-17 21:09:29 +0530
committerPratyush Yadav <me@yadavpratyush.com>2020-03-17 18:48:54 +0530
commit8a8efbe4140fd732e1890cbba6eaa85c0fac85e2 (patch)
tree35a1fdbfd785acc885d59072f195a766d6820718 /builtin/commit.c
parentMerge branch 'zs/open-current-file' (diff)
downloadgit-8a8efbe4140fd732e1890cbba6eaa85c0fac85e2.tar.gz
git-8a8efbe4140fd732e1890cbba6eaa85c0fac85e2.zip
git-gui: reduce Tcl version requirement from 8.6 to 8.5
On some MacOS distributions like High Sierra, Tcl 8.5 is shipped by default. This makes git-gui error out at startup because of the version mismatch. The only part that requires Tcl 8.6 is SimpleChord, which depends on TclOO. So, don't use it and use our homegrown class.tcl instead. This means some slight syntax changes. Since class.tcl doesn't have an "unknown" method like TclOO does, we can't just call '$note', but have to use '$note activate' instead. The constructor now needs a proper namespace qualifier. Update the documentation to reflect the new syntax. As of now, the only part of git-gui that needs Tcl 8.5 is a call to 'apply' in lib/index.tcl::lambda. Keep using it until someone shows up shouting that their OS ships with 8.4 only. Then we would have to look into implementing it in pure Tcl. Signed-off-by: Pratyush Yadav <me@yadavpratyush.com>
Diffstat (limited to 'builtin/commit.c')
0 files changed, 0 insertions, 0 deletions
re the same monotonic clock. Files on network mounted filesystems sometimes get skewed timestamps compared to "date" output, but as long as working tree files' timestamps are skewed the same way as the index file's, this approach still works. The only problematic files are the ones that have the same timestamp as the index file's, because two file updates that sandwitch the index file update must happen within the same second to trigger the problem. Signed-off-by: Junio C Hamano <junkio@cox.net> 2005-12-19format-patch: make sure header and body are separated.Junio C Hamano1-0/+2 Since log message in a commit object is defined to be binary blob, it could be something without an empty line between the title line and the body text. Be careful to format such into a form suitable for e-mail submission. There must be an empty line between the headers and the body. Signed-off-by: Junio C Hamano <junkio@cox.net> 2005-12-19diff --abbrev: document --abbrev=<n> form.Junio C Hamano2-5/+6 It was implemented there but was not advertised. Signed-off-by: Junio C Hamano <junkio@cox.net> 2005-12-19diff: --abbrev optionJunio C Hamano5-23/+93 When I show transcripts to explain how something works, I often find myself hand-editing the diff-raw output to shorten various object names in the output. This adds --abbrev option to the diff family, which shortens diff-raw output and diff-tree commit id headers. Signed-off-by: Junio C Hamano <junkio@cox.net> 2005-12-19xread/xwrite: do not worry about EINTR at calling sites.Junio C Hamano9-63/+46 We had errno==EINTR check after read(2)/write(2) sprinkled all over the places, always doing continue. Consolidate them into xread()/xwrite() wrapper routines. Credits for suggestion goes to HPA -- bugs are mine. Signed-off-by: Junio C Hamano <junkio@cox.net> 2005-12-19tests: make scripts executableJunio C Hamano8-0/+0 just for consistency. Signed-off-by: Junio C Hamano <junkio@cox.net> 2005-12-19Remove "octopus".Junio C Hamano5-133/+1 We still advertise "git resolve" as a standalone command, but never "git octopus", so nobody should be using it and it is safe to retire it. The functionality is still available as a strategy backend. Signed-off-by: Junio C Hamano <junkio@cox.net> 2005-12-19Remove unused cmd-rename.shJunio C Hamano1-62/+0 This file is a remnant from the big command rename which happened quite some time ago. Signed-off-by: Junio C Hamano <junkio@cox.net> 2005-12-19Remove generated files */*.py[co]Junio C Hamano1-1/+2 We missed ones in the compat/ subdirectory. Signed-off-by: Junio C Hamano <junkio@cox.net> 2005-12-19Documentation: stdout of update-hook is connected to /dev/nullJunio C Hamano2-2/+14 Mention that update-hook does not emit its stdout to the sender. Signed-off-by: Junio C Hamano <junkio@cox.net> 2005-12-19rev-list --objects: fix object list without commit.Junio C Hamano1-1/+2 Earlier, "rev-list --objects <sha1>" for an object chain that does not have any commit failed with a usage message. This fixes "send-pack remote $tag" where tag points at a non-commit (e.g. a blob). Signed-off-by: Junio C Hamano <junkio@cox.net> 2005-12-19Documentation/git-archimport: document -o, -a, f, -D optionsEric Wong2-3/+25 Also, ensure usage help switches are in the same order. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net> 2005-12-19howto/using-topic-branches: Recommend public URL git://git.kernel.org/Junio C Hamano1-3/+2 Recommending this means subsystem maintainers do not have to log-in just to resync with upstream. Signed-off-by: Junio C Hamano <junkio@cox.net> 2005-12-18Make "git help" sort git commands in columnsLinus Torvalds1-9/+12 This changes "pretty_print_string_list()" to show the git commands alphabetically in column order, which is the normal one. Ie instead of doing git commands available in '/home/torvalds/bin' ---------------------------------------------- add am ... applypatch archimport ... cat-file check-ref-format ... ... it does git commands available in '/home/torvalds/bin' ---------------------------------------------- add diff-tree ... am fetch ... apply fetch-pack ... ... where each column is sorted. This is how "ls" sorts things too, and since visually the columns are much more distinct than the rows, so it _looks_ more sorted. The "ls" command has a "-x" option that lists entries by lines (the way git.c used to): if somebody wants to do that, the new print-out logic could be easily accomodated to that too. Matter of taste and preference, I guess. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net> 2005-12-18Make "git help" react to window size correctlyLinus Torvalds1-0/+11 Currently the git "show commands" function will react to the environment variable COLUMNS, or just default to a width of 80 characters. That's just soo eighties. Nobody sane sets COLUMNS any more, unless they need to support some stone-age software from before the age of steam engines, SIGWINCH and TIOCGWINSZ. So get with the new century, and use TIOCGWINSZ to get the terminal size. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net> 2005-12-18Documentation: typos and small fixes in "everyday".Junio C Hamano1-13/+17 Signed-off-by: Junio C Hamano <junkio@cox.net> 2005-12-18clone-pack: remove unused and undocumented --keep flagJunio C Hamano2-4/+2 While we are at it, give fully spelled --keep to fetch-pack. Also give --quiet in addition to -q to fetch-pack as well. Signed-off-by: Junio C Hamano <junkio@cox.net> 2005-12-17fetch-pack: -k option to keep downloaded pack.Junio C Hamano6-173/+206 Split out the functions that deal with the socketpair after finishing git protocol handshake to receive the packed data into a separate file, and use it in fetch-pack to keep/explode the received pack data. We earlier had something like that on clone-pack side once, but the list discussion resulted in the decision that it makes sense to always keep the pack for clone-pack, so unpacking option is not enabled on the clone-pack side, but we later still could do so easily if we wanted to with this change. Signed-off-by: Junio C Hamano <junkio@cox.net> 2005-12-17Revert "get_sha1_basic(): corner case ambiguity fix"Junio C Hamano2-49/+1 This reverts 6677c4665af2d73f670bec382bc82d0f2e9513fb commit. The misguided disambiguation has been reverted, so there is no point testing that misfeature. 2005-12-17Revert "We do not like "HEAD" as a new branch name"Junio C Hamano1-5/+0 This reverts ee34518d629331dadd58b1a75294369d679eda8b commit. 2005-12-17Revert "refs.c: off-by-one fix."Junio C Hamano1-5/+2 This reverts 06bf6ac4248e834a229027908d405f5e42ac96d7 commit. 2005-12-17Remove misguided branch disambiguation.Junio C Hamano1-30/+3 This removes the misguided attempt to refuse processing a branch name xyzzy and insist it to be given as either heads/xyzzy or tags/xyzzy when a tag xyzzy exists. There was no reason to do so --- the search order was predictable and well defined, so if the user says xyzzy we should have taken the tag xyzzy in such a case without complaining. This incidentally fixes another subtle bug related to this. If such a duplicate branch/tag name happened to be a unique valid prefix of an existing commit object name (say, "beef"), we did not take the tag "beef" but after complaining used the commit object whose name started with beef. Another problem this fixes while introducing some confusion is that there is no longer a reason to forbid a branch name HEAD anymore. In other words, now "git pull . ref1:HEAD" would work as expected, once we revert "We do not like HEAD branch" patch. It creates "HEAD" branch under ${GIT_DIR-.git}/refs/heads (or fast-forwards if already exists) using the tip of ref1 branch from the current repository, and merges it into the current branch. Signed-off-by: Junio C Hamano <junkio@cox.net> 2005-12-17Documentation: HTTP needs update-server-info.Junio C Hamano3-10/+25 Signed-off-by: Junio C Hamano <junkio@cox.net> 2005-12-16Comment fixes.Junio C Hamano2-3/+3 Signed-off-by: Junio C Hamano <junkio@cox.net> 2005-12-16Fix git-am --skipJan Harkes1-0/+2 git-am --skip does not unpack the next patch and ends up reapplying the old patch, believing that it is the new patch in the sequence. If the old patch applied successfully it will commit it with the supposedly skipped log message and ends up dropping the following patch. If the patch did not apply the user is left with the conflict he tried to skip and has to unpack the next patch in the sequence by hand to get git-am back on track. By clearing the resume variable whenever skips bumps the sequence counter we correctly unpack the next patch. I also added another resume= in the case a patch file is missing from the sequence to avoid the same problem when a file in the sequence was removed. Signed-off-by: Jan Harkes <jaharkes@cs.cmu.edu> Signed-off-by: Junio C Hamano <junkio@cox.net> 2005-12-16Forbid pattern maching characters in refnames.Junio C Hamano2-4/+8 by marking '?', '*', and '[' as bad_ref_char(). Signed-off-by: Junio C Hamano <junkio@cox.net> 2005-12-16Examples of resetting.Junio C Hamano4-0/+47 Morten Welinder says examples of resetting is really about recovering from botched commit/pulls. I agree that pointers from commands that cause a reset to be needed in the first place would be very helpful. Also reset examples did not mention "pull/merge" cases. Signed-off-by: Junio C Hamano <junkio@cox.net> 2005-12-15refs.c: off-by-one fix.Junio C Hamano1-2/+5 Signed-off-by: Junio C Hamano <junkio@cox.net> 2005-12-15We do not like "HEAD" as a new branch nameJohannes Schindelin1-0/+5 This makes git-check-ref-format fail for "HEAD". Since the check is only executed when creating refs, the existing symbolic ref is safe. Otherwise these commands, most likely are pilot errors, would do pretty funky stuff: git checkout -b HEAD git pull . other:HEAD Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net> 2005-12-15Sort globbed refname in show-branch.Junio C Hamano1-0/+2 "git show-branch bugs/*" shows all branches whose name match the specified pattern, but in the order readdir() happened to returned. Sort them to make the output more predictable. Signed-off-by: Junio C Hamano <junkio@cox.net> 2005-12-15small cleanup for diff-delta.cNicolas Pitre1-22/+12 This patch removes unused remnants of the original xdiff source. No functional change. Possible tiny speed improvement. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <junkio@cox.net> 2005-12-15git-whatchanged: Add usage stringFredrik Kuivinen1-0/+5 Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net> 2005-12-15git-log: Add usage stringFredrik Kuivinen1-4/+4 Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net> 2005-12-15git-diff: Usage string clean-upFredrik Kuivinen1-8/+6 Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net> 2005-12-15applymbox: typofixJunio C Hamano1-1/+1 Sorry, I broke this command completely with the stupid typo. Noticed by Marco Costalba. Signed-off-by: Junio C Hamano <junkio@cox.net> 2005-12-15get_sha1_basic(): corner case ambiguity fixJunio C Hamano3-9/+75 When .git/refs/heads/frotz and .git/refs/tags/frotz existed, and the object name stored in .git/refs/heads/frotz were corrupt, we ended up picking tags/frotz without complaining. Worse yet, if the corrupt .git/refs/heads/frotz was more than 40 bytes and began with hexadecimal characters, it silently overwritten the initial part of the returned result. This commit adds a couple of tests to demonstrate these cases, with a fix. Signed-off-by: Junio C Hamano <junkio@cox.net> 2005-12-14Documentation: tutorialJunio C Hamano1-0/+6 At the beginning of tutorial, refer the reader to everyday if she has not done so yet. Signed-off-by: Junio C Hamano <junkio@cox.net> 2005-12-14svnimport: exit cleanly when we are up to dateMartin Langhoff1-0/+7 Now we detect that the SVN repo does not have new commits for us and exit cleanly, removing the lockfile. With this, svnimport supports being run on a cronjob to maintain a SVN2GIT gateway. Signed-off-by: Martin Langhoff <martin@catalyst.net.nz> Signed-off-by: Junio C Hamano <junkio@cox.net> 2005-12-14clone-pack: make it usable for partial branch cloning.Junio C Hamano2-3/+16 clone-pack had some logic to accept subset of remote refs from the command line and clone from there. However, it was never used in practice and its problems were not found out so far. This commit changes the command to output the object names of refs to the standard output instead of making a clone of the remote repository when explicit <head> parameters are given; the output format is the same as fetch-pack. The traditional behaviour of cloning the whole repository by giving no explicit <head> parameters stays the same. Signed-off-by: Junio C Hamano <junkio@cox.net>