Re: git rebase --interactive using short SHA-1's internally
Ooops, that's exactly it =) On Sat, Aug 10, 2013 at 2:28 AM, Junio C Hamano wrote: > David writes: > >> On 10 August 2013 05:22, Diogo de Campos wrote: >>> Had some problems rebasing a large repository, fatal error because a >>> short SHA-1 ref was ambiguous. >> >> This recent disussion might also interest you: >> http://thread.gmane.org/gmane.comp.version-control.git/229091 > > I was wondering why the topic looked familiar ;-) -- Diogo Campos Engineering Simulation and Scientific Software BOS - Business Operation Support Software Engineer -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
git rebase --interactive "forgets" strategies after --continue
I had some problems rebasing a repository that had empty commits, which caused the rebase to stop. After continuing it with git rebase --continue, it seems that the strategies I originally gave were forgotten. I quickly glanced at the code, and it seems that a lot of rebase options are stored in in a $state_dir, but $strategy_args is not one of them. Since git rebase --interactive not ignoring strategies (https://github.com/git/git/commit/db2b3b820e2b28da268cc88adff076b396392dfe) is a recent change to Git (only available in 1.8.4-rc+), I believe that this was overlooked. -- Diogo Campos -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
git rebase --interactive using short SHA-1's internally
Had some problems rebasing a large repository, fatal error because a short SHA-1 ref was ambiguous. After a quick inspection of git-rebase--interactive.sh, I found that it uses short refs in a few places (git rev-parse --short). Removing that option fixed my problem. See: https://github.com/git/git/blob/master/git-rebase--interactive.sh#L902 -- Diogo Campos -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
"git log --follow filename" (with diff.renameLimit=0) not working after subtree add
Problem: "git log --follow filename" is not working for files after a big move. Scenario: Just performed a "git subtree add" where big projects were moved into another repository, and I'm not able to view history for a single file. Sample output: Output after subtree add (no output) > git log --follow --oneline file.py Output from same command in old repository (the one that was merged with subtree, this is the output i expect to continue having atfer a merge) > git log --follow --oneline file.py cefa32b Convert doc strings to Sphinx 748b2dd Added target for C++ tests 1f2b52e Using default git_source_server for everything after moving to Stash ... [more commits] A couple of notes: - Made sure I used --follow - Using options diff.renameLimit=0 and diff.renames=true - Tried options -C and -M (even though there were no changes, should be a 100% rename match) - "git subtree add" was made without --squash to keep history - "git blame file.py" works fine, detects all changes and rename history - Commits added after the merge are tracked, but log stops at merge - Tested with git 1.8.3.4 - This guy in StackOverflow seems to have the same problem: http://stackoverflow.com/questions/4393527/why-might-git-log-not-show-history-for-a-moved-file-and-what-can-i-do-about-it Relevant output for "git config -l" in repository: core.symlinks=false core.autocrlf=false color.diff=auto color.status=auto color.branch=auto color.interactive=true pack.packsizelimit=2g help.format=html http.sslcainfo=/bin/curl-ca-bundle.crt sendemail.smtpserver=/bin/msmtp.exe diff.astextplain.textconv=astextplain rebase.autosquash=true core.packedgitlimit=128m diff.renamelimit=0 diff.renames=true core.repositoryformatversion=0 core.filemode=false core.bare=false core.logallrefupdates=true core.symlinks=false core.ignorecase=true core.hidedotfiles=dotGitOnly -- Diogo Campos -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
