Keegan Carruthers-Smith
16089481f0
git: Include GitErrorData in GitError.toString
...
We are passing `GitErrorData` to `JSON.stringify` to include in the string
generated by `GitError.toString`. However, we set `replacer` to `[]`, which
means `JSON.stringify` will _always_ serialize to `{ }`. After this change
GitError messages should be more understandable, and not just say `Failed to
execute git`.
2017-10-26 11:32:48 +02:00
Stuart Baker
3afbdb4126
Ask to publish branch if there is no upstream
2017-10-17 14:38:08 +01:00
Peter Kahle
124b9a4032
Cleaning up handling of Git Submodule status
2017-10-15 21:16:45 -04:00
Peter Kahle
9e2338a8c7
First, naive pass at supporting submodules.
...
Scan for submodules when a module is added, and add those repositories immediately.
2017-10-12 21:43:25 -04:00
Joao Moreno
dfc3c944a4
remove unused variable
2017-10-10 16:05:37 +02:00
Brendan Forster
b1407a87b0
disable lookup for GitHub's version of Git
...
If the classic GitHub for Windows (creatively named github.exe) is installed alongside the new GitHub Desktop (which installs a github.bat file to PATH), we can get into the situation where Code can ask the GUI to authenticate for a private repository, which it doesn't understand.
2017-10-10 18:04:14 +11:00
Joao Moreno
6a6b589eb8
fix compile errors
2017-10-04 15:43:48 +02:00
Joao Moreno
9b7a6b6fb9
fixes #35513
2017-10-04 15:01:32 +02:00
Joao Moreno
ae7e9613ce
fixes #34358
2017-09-28 10:05:20 +02:00
Joao Moreno
01dade32b7
fix #34645
2017-09-20 13:36:47 +02:00
Raoul D'Cunha
21aac84936
Add support for Stash (Include Untracked)
2017-09-20 17:06:52 +12:00
Joao Moreno
5a4a40c9cb
fixes #34209
2017-09-12 15:13:49 +02:00
Joao
cb5d03296f
fix compile error
2017-09-04 11:10:34 +02:00
Matt Bierner
69afce7650
Build using TS 2.5 ( #33705 )
...
* Build using TS 2.5
Fixes #33704
* Remove explicit return type
2017-09-01 13:52:42 -07:00
Justin Horner
e34b313026
Merge branch 'master' into justinhhorner-git-rename-branch
2017-08-21 22:51:06 -04:00
Joao Moreno
3f31510686
git: multirepo revert
2017-08-15 16:20:58 +02:00
Joao Moreno
5553acb377
cleanup git stash functionality
2017-08-15 10:03:42 +02:00
Krzysztof Cieślak
b5bf3535ef
Fix stash pop
2017-08-14 22:30:52 +02:00
Krzysztof Cieślak
4cd45c49bd
Repository and Model changes
2017-08-14 22:30:36 +02:00
Justin Horner
d76ae31041
Add error codes and func for rename branch
2017-08-10 14:03:16 -04:00
Joao Moreno
e12c7d3830
Merge branch 'ashutoshdhundhara-git-tag'
2017-08-10 15:44:23 +02:00
Joao Moreno
37de7e182f
git: cleanup tag
2017-08-10 15:44:10 +02:00
Joao Moreno
0bd753f8a1
Merge branch 'git-tag' of https://github.com/ashutoshdhundhara/vscode into ashutoshdhundhara-git-tag
2017-08-10 15:38:26 +02:00
João Moreno
7494a1b944
Merge pull request #27136 from dmportella/gpg-support
...
GPG support
2017-08-10 09:48:20 +01:00
João Moreno
e122921970
Merge pull request #26147 from samlh/patch-1
...
Fix staging lines to not corrupt line endings when autocrlf is enabled
2017-08-10 09:39:44 +01:00
Daniel Portella
ff1d9f13c6
added Config information
...
Ticket #5065
2017-07-11 17:09:36 +01:00
Daniel Portella
d266d9a994
[WIP] Added support for -S for signing git commits
...
Ticket #5065
2017-07-11 17:09:36 +01:00
Joao Moreno
ac78ebd870
fixes #30054
2017-07-03 17:28:33 +02:00
Joao Moreno
a05d64d7f0
fixes #29448
2017-06-29 11:05:39 +02:00
Joao Moreno
dd07972305
fixes #27488
2017-06-27 12:40:28 +02:00
Joao Moreno
417cdb62b7
git.pullFrom
...
octopus commit
2017-06-26 15:46:51 +02:00
Joao Moreno
5f31035e46
Merge branch 'git_pull_from' of https://github.com/Krzysztof-Cieslak/vscode into Krzysztof-Cieslak-git_pull_from
2017-06-26 15:36:17 +02:00
Joao Moreno
53ce1b0b46
Merge branch 'master' of https://github.com/matthewshirley/vscode into matthewshirley-master
2017-06-26 15:36:00 +02:00
Joao Moreno
14380f9766
Merge branch 'bc/Feature26738' of https://github.com/BugraC/vscode into BugraC-bc/Feature26738
2017-06-26 15:34:26 +02:00
Joao Moreno
842421f3f5
catch merge conflicts
2017-06-26 11:18:18 +02:00
Joao Moreno
f23a32b7a7
Merge branch 'git-merge' of https://github.com/gecharo/vscode into gecharo-git-merge
2017-06-26 09:56:42 +02:00
Krzysztof Cieślak
faf6134387
Add branch and remote args to pull in model and repository
2017-06-23 11:09:21 +02:00
Bugra Cuhadaroglu
39f33ae2ae
Git: Pull from specific branch
2017-06-20 19:52:47 -07:00
Joao Moreno
09e22b8542
fixes #27367
2017-06-14 15:16:34 +02:00
Maik Riechert
b348a0b780
handle git branch delete error ("not fully merged")
2017-05-26 09:27:25 +02:00
Maik Riechert
b96478ebcc
add git delete branch command
2017-05-26 09:27:24 +02:00
Matt Shirley
42ab4c41a4
Add "pullFrom" git command
...
Resolves Microsoft/vscode#26738
2017-05-20 11:07:34 -07:00
Ashutosh Dhundhara
211e7a3030
[ #25575 ] Add Git Tag feature.
2017-05-20 23:04:30 +05:30
Anthony Sottile
0b7f4425ef
Correct LC_ALL. Resolves #26227
2017-05-10 13:37:52 -07:00
Samuel Harrington
b3380142b3
Fix staging lines to not corrupt line endings when autocrlf is enabled
...
Pass the --path argument to git hash-object so that filters are correctly applied when staging lines. This prevents lines with crlf from being added to files that have autocrlf=true. Old versions of git can complain quite a bit if you get into this state.
From: https://git-scm.com/docs/git-hash-object
```
--path
Hash object as it were located at the given path. The location of file does not directly influence on the hash value, but path is used to determine what Git filters should be applied to the object before it can be placed to the object database, and, as result of applying filters, the actual blob put into the object database may differ from the given file. This option is mainly useful for hashing temporary files located outside of the working directory or files read from stdin.
```
2017-05-07 00:16:02 -07:00
Rokas Gečas
818fa5a50f
#10542 Ability to merge local git branches
2017-05-01 16:44:00 +03:00
Joao Moreno
9234a7c97c
🐛 dont call iconv with unsupported encodings
...
fixes #25359
2017-04-26 16:58:12 +02:00
Joao Moreno
facdcded9d
🐛 git status errors are incomplete
...
fixes #25408
fixes #25302
2017-04-26 16:54:45 +02:00
Joao Moreno
24dcf7a27d
🐛 git always show stderr
...
fixes #23632
2017-04-25 17:37:27 +02:00
Joao Moreno
566fdd4879
🎨 cleanup git show code
2017-04-24 10:51:08 +02:00
