1. Stefan Saasen
  2. git

Commits

Show all
Author Commit Message Date Builds
Michael Haggerty
git-svn: Demonstrate a bug with root commits in mergeinfo ranges If a svn:mergeinfo range starts at a commit that was converted as a git root commit (e.g., r1 or a branch that was created out of thin air), then there is an error when git-svn tries to run git rev-list "$bottom_commit^..$top_commit" because $bottom_commit (the git commit corresponding to r1) has no parent. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Acked-by: Eric Wong <normalpe…
Jens Lehmann
submodule add: always initialize .git/config entry When "git submodule add $path" is run to add a subdirectory $path to the superproject, and $path is already the top of the working tree of the submodule repository, the command created submodule.$path.url entry in the configuration file in the superproject. However, when adding a repository $URL that is outside the respository of the superproject to $path that does not exist (yet) with "git submod…
Junio C Hamano
submodule sync: do not auto-vivify uninteresting submodule Earlier 33f072f (submodule sync: Update "submodule.<name>.url" for empty directories, 2010-10-08) attempted to fix a bug where "git submodule sync" command does not update the URL if the current superproject does not have a checkout of the submodule. However, it did so by unconditionally registering submodule.$name.url to every submodule in the project, even the ones that the user has never showe…
Junio C Hamano
Git 1.7.6 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tags
v1.7.6
Junio C Hamano
Merge branch 'maint' * maint: completion: replace core.abbrevguard to core.abbrev
Junio C Hamano
Merge branch 'maint-1.7.4' into maint * maint-1.7.4: completion: replace core.abbrevguard to core.abbrev
Namhyung Kim
completion: replace core.abbrevguard to core.abbrev The core.abbrevguard config variable had removed and now core.abbrev has been used instead. Teach it. Signed-off-by: Namhyung Kim <namhyung@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
glossary: clarify description of HEAD HEAD on a branch does reference a commit via the branch ref it refers to. The main difference of a detached HEAD is that it _directly_ refers to a commit. Clarify this. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
glossary: update description of head and ref Reword them to avoid sounding as if loose refs are the only ones in the world. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
glossary: update description of "tag" It is an unimportant implementation detail that ref namespaces are implemented as subdirectories of $GIT_DIR/refs. What is more important is that tags are in refs/tags hierarchy in the ref namespace. Also note that a tag can point at an object of arbitrary type, not limited to commit. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
git.txt: de-emphasize the implementation detail of a ref It is an unimportant implementation detail that branches and tags are stored somewhere under $GIT_DIR/refs directory, or the name of the commit that will become the parent of the next commit is stored in $GIT_DIR/HEAD. What is more important is that branches live in refs/heads and tags live in refs/tags hierarchy in the ref namespace, and HEAD means the tip of the current branch. Signed-off-by: …
Junio C Hamano
check-ref-format doc: de-emphasize the implementation detail of a ref It is an unimportant implementation detail that branches and tags are stored somewhere under $GIT_DIR/refs directory. What is more important is that branches live in refs/heads and tags live in refs/tags hierarchy in the ref namespace. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
git-remote.txt: avoid sounding as if loose refs are the only ones in the world It was correct to say "The file $GIT_DIR/refs/heads/master stores the commit object name at the tip of the master branch" in the older days, but not anymore, as refs can be packed into $GIT_DIR/packed-refs file. Update the document to talk in terms of a more abstract concept "ref" and "symbolic ref" where we are not describing the underlying implementation detail. This on purpose leaves two inst…
Namhyung Kim
git-remote.txt: fix wrong remote refspec $GIT_DIR/remotes/<name>/<branch> should be $GIT_DIR/refs/remotes/<name>/<branch>. Signed-off-by: Namhyung Kim <namhyung@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Git 1.7.6-rc3 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tags
v1.7.6-rc3
Junio C Hamano
Merge branch 'maint' * maint: Documentation: git diff --check respects core.whitespace
Fredrik Kuivinen
Makefile: Track changes to LDFLAGS and relink when necessary Some profiling tools (e.g., google-perftools and mutrace) work by linking in a new library into the executables. When using these tools it is convenient to only relink instead of doing a full make clean; make cycle. This change complements the auto-detection of changes to CFLAGS that we already have. Tracking of more variables that affect the build can be added when the need arise. Signed-off-by…
Christof Krüger
Documentation: git diff --check respects core.whitespace Fix documentation on "git diff --check" by adopting the description from "git apply --whitespace". Signed-off-by: Christof Krüger <git@christof-krueger.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'maint' * maint: gitweb: 'pickaxe' and 'grep' features requires 'search' to be enabled
Jakub Narębski
gitweb: 'pickaxe' and 'grep' features requires 'search' to be enabled Both 'pickaxe' (searching changes) and 'grep' (searching files) require basic 'search' feature to be enabled to work. Enabling e.g. only 'pickaxe' won't work. Add a comment about this. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'mk/grep-pcre' * mk/grep-pcre: t7810: avoid unportable use of "echo"
Junio C Hamano
t7810: avoid unportable use of "echo" Michael J Gruber noticed that under /bin/dash this test failed (as is expected -- \n in the string can be interpreted by the command), while it passed with bash. We probably could work it around by using backquote in front of it, but it is safer and more readable to avoid "echo" altogether in a case like this. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jim Meyering
plug a few coverity-spotted leaks Signed-off-by: Jim Meyering <meyering@redhat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
cygwin: trust executable bit by default Earlier 7974843 (compat/cygwin.c: make runtime detection of lstat/stat lessor impact, 2008-10-23) fixed the low-level "do we use cygwin specific hacks for stat/lstat?" logic not to call into git_default_config() from random codepaths that are typically very late in the program, to prevent the call from potentially overwriting other variables that are initialized from the configuration. However, i…
Jens Lehmann
fetch: Also fetch submodules in subdirectories in on-demand mode When on-demand mode was active examining the new commits just fetched in the superproject (to check if they record commits for submodules which are not downloaded yet) wasn't done recursively. Because of that fetch did not recursively fetch submodules living in subdirectories even when it should have. Fix that by adding the RECURSIVE flag to the diff_options used to check the new commits and avoi…
Jeff King
tag: accept multiple patterns for --list Until now, "git tag -l foo* bar*" would silently ignore the second argument, showing only refs starting with "foo". It's not just unfriendly not to take a second pattern; we actually generated subtly wrong results (from the user's perspective) because some of the requested tags were omitted. This patch allows an arbitrary number of patterns on the command line; if any of them matches, the ref is …
Junio C Hamano
Merge branch 'di/no-no-existant' * di/no-no-existant: Fix typo: existant->existent
Junio C Hamano
Merge branch 'maint' * maint: builtin/gc.c: add missing newline in message
Andreas Schwab
builtin/gc.c: add missing newline in message Signed-off-by: Andreas Schwab <schwab@linux-m68k.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Andrew Wong
rebase -i -p: include non-first-parent commits in todo list Consider this graph: D---E (topic, HEAD) / / A---B---C (master) \ F (topic2) and the following three commands: 1. git rebase -i -p A 2. git rebase -i -p --onto F A 3. git rebase -i -p B Currently, (1) and (2) will pick B, D, C, and E onto A and F, respectively. However, (3) will only pick D and E onto B, but not C, which is inconsistent with (…
  1. Prev
  2. Next