Commits

Show all
Author Commit Message Labels Comments Date
Junio C Hamano
Git 1.7.3 rc1 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tags
v1.7.3-rc1
Junio C Hamano
Merge branch 'np/relnotes-in-subdir' * np/relnotes-in-subdir: install-webdoc: keep installed RelNotes-*.txt Documentation: move RelNotes into a directory of their own
Junio C Hamano
Prepare for 1.7.3 rc1
Junio C Hamano
Merge branch 'maint' * maint: config.txt: fix placement of diff.noprefix
Mark Lodato
config.txt: fix placement of diff.noprefix In git-config(1), diff.noprefix was placed in between diff.mnemonicprefix and the list of mnemonic prefixes, which is obviously incorrect and very confusing to readers. Now, it is located after the end of the explanation of mnemonicprefix, which makes much more sense. Signed-off-by: Mark Lodato <lodatom@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Brandon Casey
t/t4018: avoid two unnecessary sub-shell invocations Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'maint' * maint: xdiff-interface.c: always trim trailing space from xfuncname matches diff.c: call regfree to free memory allocated by regcomp when necessary
Brandon Casey
t/t4018: test whether the word_regex patterns compile Previously (e3bf5e43), a test was added to test whether the builtin xfuncname regular expressions could be compiled without error by regcomp. Let's do the same for the word_regex patterns. This should help catch any cross-platform incompatibilities that exist between the pattern creator's system and the various platforms that the test suite is commonly run on. Signed-off-by: Brandon Casey <casey…
Brandon Casey
xdiff-interface.c: always trim trailing space from xfuncname matches Generally, trailing space is removed from the string matched by the xfuncname patterns. The exception is when the matched string exceeds the length of the fixed-size buffer that it will be copied in to. But, a string that exceeds the buffer can still contain trailing space in the portion of the string that will be copied into the buffer. So, simplify this code slightly, and just perform the tra…
Brandon Casey
diff.c: call regfree to free memory allocated by regcomp when necessary Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Brandon Casey
t/t5510-fetch.sh: improve testing with explicit URL and merge spec Commit 6106ce46 introduced a test to demonstrate fetch's failure to retrieve any objects or update FETCH_HEAD when it was supplied a repository URL and the current branch had a configured merge spec. This commit expands the original test based on comments from Junio Hamano. In addition to actually verifying that the fetch updates FETCH_HEAD correctly, and does not update the current branch, two …
Brandon Casey
builtin/fetch.c: comment that branch->remote_name is usable when has_merge Save future readers the trouble of tracing code to determine that the two uses of branch->remote_name are safe when has_merge is set, by adding a comment explaining that it is so. Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Brandon Casey
Makefile: use compat regex on IRIX 6.5 The IRIX 6.5 regex.h header file defines REG_STARTEND, but the feature does not appear to work. Since REG_STARTEND is required for proper functioning of git-grep, set NO_REGEX and use the alternative regex libraries in compat/ Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Brandon Casey
t/t7008: workaround broken handling of \000 by printf on IRIX On IRIX 6.5, the printf utility in /usr/bin does not appear to handle the \ddd notation according to POSIX. This printf appears to halt processing of the string argument and ignore any additional characters in the string. Work around this flaw by replacing the \000's with 'Q' and using the q_to_nul helper function provided by test-lib.sh This problem with printf is not apparent when using the Ba…
Junio C Hamano
install-webdoc: keep installed RelNotes-*.txt Otherwise URLs in the wild that point at older release notes will become dangling. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'tf/cleanup-builtin-help-headers' * tf/cleanup-builtin-help-headers: builtin.h: Move two functions definitions to help.h.
Junio C Hamano
Merge branch 'jk/test-must-fail-missing' * jk/test-must-fail-missing: tests: make test_might_fail fail on missing commands tests: make test_might_fail more verbose tests: make test_must_fail fail on missing commands tests: make test_must_fail more verbose
Junio C Hamano
Merge branch 'jh/error-removing-missing-note' * jh/error-removing-missing-note: notes: Don't create (empty) commit when removing non-existing notes
Junio C Hamano
Merge branch 'kf/askpass-config' * kf/askpass-config: Extend documentation of core.askpass and GIT_ASKPASS. Allow core.askpass to override SSH_ASKPASS. Add a new option 'core.askpass'.
Junio C Hamano
Merge branch 'bc/maint-fetch-url-only' * bc/maint-fetch-url-only: builtin/fetch.c: ignore merge config when not fetching from branch's remote t/t5510: demonstrate failure to fetch when current branch has merge ref
Junio C Hamano
Merge branch 'jk/maint-pass-c-config-in-env' * jk/maint-pass-c-config-in-env: do not pass "git -c foo=bar" params to transport helpers pass "git -c foo=bar" params through environment
Junio C Hamano
Merge branch 'en/d-f-conflict-fix' * en/d-f-conflict-fix: fast-export: ensure that a renamed file is printed after all references
Johannes Sixt
fast-export: ensure that a renamed file is printed after all references t9350 sets up a commit where a file is both copied and renamed. The output of fast-export for this commit should look like this: author ... committer ... from :19 C "file2" "file4" R "file2" "file5" The order of the two modification lines is derived from the result that the diff machinery produces. 060df62 (fast-export: Fix output order of D/F changes) inserted a qsort call that modif…
Nicolas Pitre
Documentation: move RelNotes into a directory of their own There are 108 of them already. That's a bit more than one third of all the files in the Documentation directory already, and still growing. Signed-off-by: Nicolas Pitre <nico@fluxnic.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'maint' * maint: revert: Fix trivial comment style issue cache_tree_free: Fix small memory leak Conflicts: builtin/revert.c
Elijah Newren
revert: Fix trivial comment style issue Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Elijah Newren
cache_tree_free: Fix small memory leak Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'jh/clean-exclude' * jh/clean-exclude: builtin/clean.c: Use STRING_LIST_INIT_NODUP.
Thiago Farina
builtin/clean.c: Use STRING_LIST_INIT_NODUP. Signed-off-by: Thiago Farina <tfransosi@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jens Lehmann
t3404 & t7508: cd inside subshell instead of around Fixed all places where it was a straightforward change from cd'ing into a directory and back via "cd .." to a cd inside a subshell. Found these places with "git grep -w "cd \.\.". Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
  1. Prev
  2. Next