Commits

Show all
Author Commit Message Labels Comments Date
Junio C Hamano
Git 1.8.0.2 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tags
v1.8.0.2
Sébastien Loriot
Documentation/git-stash.txt: add a missing verb Signed-off-by: Sébastien Loriot <sloriot.ml@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
git(1): remove a defunct link to "list of authors" The linked page has not been showing the promised "more complete list" for more than 6 months by now, and nobody has resurrected the list there nor elsewhere since then. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Update draft release notes to 1.8.0.2 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'jc/doc-push-satellite' into maint * jc/doc-push-satellite: Documentation/git-push.txt: clarify the "push from satellite" workflow
Junio C Hamano
Merge branch 'jc/same-encoding' into maint Various codepaths checked if two encoding names are the same using ad-hoc code and some of them ended up asking iconv() to convert between "utf8" and "UTF-8". The former is not a valid way to spell the encoding name, but often people use it by mistake, and we equated them in some but not all codepaths. Introduce a new helper function to make these codepaths consistent. * jc/same-encoding: reen…
Junio C Hamano
Merge branch 'lt/diff-stat-show-0-lines' into maint "git diff --stat" miscounted the total number of changed lines when binary files were involved and hidden beyond --stat-count. It also miscounted the total number of changed files when there were unmerged paths. * lt/diff-stat-show-0-lines: t4049: refocus tests diff --shortstat: do not count "unmerged" entries diff --stat: do not count "unmerged" entries diff --stat: move the "total coun…
Matthieu Moy
git-fast-import.txt: improve documentation for quoted paths The documentation mentioned only newlines and double quotes as characters needing escaping, but the backslash also needs it. Also, the documentation was not clearly saying that double quotes around the file name were required (double quotes in the examples could be interpreted as part of the sentence, not part of the actual string). Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by…
Matthieu Moy
git-remote-mediawiki: escape ", \, and LF in file names A mediawiki page can contain, and even start with a " character, we have to escape it when generating the fast-export stream, as well as \ character. While we're there, also escape newlines, but I don't think we can get them from MediaWiki pages. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
t4049: refocus tests The primary thing Linus's patch wanted to change was to make sure that 0-line change appears for a mode-only change. Update the first test to chmod a file that we can see in the output (limited by --stat-count) to demonstrate it. Also make sure to use test_chmod and compare the index and the tree, so that we can run this test even on a filesystem without permission bits. Later two tests are abo…
Junio C Hamano
Start preparing for 1.8.0.2 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'rh/maint-gitweb-highlight-ext' into maint Syntax highlighting in "gitweb" was not quite working. * rh/maint-gitweb-highlight-ext: gitweb.perl: fix %highlight_ext mappings
Junio C Hamano
Merge branch 'pw/maint-p4-rcs-expansion-newline' into maint "git p4" used to try expanding malformed "$keyword$" that spans across multiple lines. * pw/maint-p4-rcs-expansion-newline: git p4: RCS expansion should not span newlines
Ralf Thielow
completion: add options --single-branch and --branch to "git clone" Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Documentation/git-push.txt: clarify the "push from satellite" workflow The context of the example to push into refs/remotes/satellite/ hierarchy of the other repository needs to be spelled out explicitly for the value of this example to be fully appreciated. Make it so. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
diff --shortstat: do not count "unmerged" entries Fix the same issue as the previous one for "git diff --stat"; unmerged entries was doubly-counted. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'nd/maint-compat-fnmatch-fix' into maint * nd/maint-compat-fnmatch-fix: compat/fnmatch: fix off-by-one character class's length check
Junio C Hamano
Merge branch 'jh/update-ref-d-through-symref' into maint * jh/update-ref-d-through-symref: Fix failure to delete a packed ref through a symref t1400-update-ref: Add test verifying bug with symrefs in delete_ref()
Junio C Hamano
Merge branch 'esr/maint-doc-fast-import' into maint * esr/maint-doc-fast-import: doc/fast-import: clarify how content states are built
Junio C Hamano
Merge branch 'wtk/submodule-doc-fixup' into maint * wtk/submodule-doc-fixup: git-submodule: wrap branch option with "<>" in usage strings.
Junio C Hamano
diff --stat: do not count "unmerged" entries Even though we show a separate *UNMERGED* entry in the patch and diffstat output (or in the --raw format, for that matter) in addition to and separately from the diff against the specified stage (defaulting to #2) for unmerged paths, they should not be counted in the total number of files affected---that would lead to counting the same path twice. The separation done by the previous step makes th…
Junio C Hamano
diff --stat: move the "total count" logic to the last loop The diffstat generation logic, with --stat-count limit, is implemented as three loops. - The first counts the width necessary to show stats up to specified number of entries, and notes up to how many entries in the data we need to iterate to show the graph; - The second iterates that many times to draw the graph, adjusts the number of "total modified files", and counts the total ad…
Junio C Hamano
diff --stat: use "file" temporary variable to refer to data->files[i] The generated code shouldn't change but it is easier to read. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
diff --stat: status of unmodified pair in diff-q is not zero It is spelled DIFF_STATUS_UNKNOWN these days, and is different from zero. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
test: add failing tests for "diff --stat" to t4049 There are a few problems in diff.c around --stat area, partially caused by the recent 74faaa1 (Fix "git diff --stat" for interesting - but empty - file changes, 2012-10-17), and largely caused by the earlier change that introduced when --stat-count was added. Add a few test pieces to t4049 to expose the issues. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Mark Szepieniec
Documentation: improve phrasing in git-push.txt The current version contains the sentence: Further suppose that the other person already pushed changes leading to A back to the original repository you two obtained the original commit X. which doesn't parse for me; I've changed it to Further suppose that the other person already pushed changes leading to A back to the original repository from which you two obtained the original commit X. Sig…
Antoine Pelisse
Fix typo in remote set-head usage parenthesis are not matching in `builtin_remote_sethead_usage` as a square bracket is closing something never opened. Signed-off-by: Antoine Pelisse <apelisse@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Paul Gortmaker
Makefile: hide stderr of curl-config test You will get $ make distclean 2>&1 | grep curl /bin/sh: curl-config: not found /bin/sh: curl-config: not found /bin/sh: curl-config: not found /bin/sh: curl-config: not found /bin/sh: curl-config: not found $ if you don't have a curl development package installed. The intent is not to alarm the user, but just to test if there is a new enough curl installed. However,…
Junio C Hamano
Git 1.8.0.1 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tags
v1.8.0.1
Junio C Hamano
Merge branch 'jk/checkout-out-of-unborn' into maint * jk/checkout-out-of-unborn: checkout: print a message when switching unborn branches
  1. Prev
  2. Next