DeforaOS/Browser
DeforaOS/Browser
2
0
Fork 0
Code Issues 2 Pull Requests Packages Projects Releases Wiki Activity

Git is able to handle binary files on its own

Browse Source
This commit is contained in:
Pierre Pronchery 2012-12-10 11:06:31 +01:00
parent 25c11879b6
commit f795aa4503
1 changed files with 1 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/plugins/git.c
View File

@ -545,14 +545,12 @@ static void _git_task_close_channel(GitTask * task, GIOChannel * channel)
/* callbacks */ /* callbacks */
/* git_on_add */ /* git_on_add */
static gboolean _add_is_binary(char const * type);
static void _git_on_add(gpointer data) static void _git_on_add(gpointer data)
{ {
Git * git = data; Git * git = data;
gchar * dirname; gchar * dirname;
gchar * basename; gchar * basename;
char * argv[] = { "git", "add", "--", NULL, NULL, NULL }; char * argv[] = { "git", "add", "--", NULL, NULL };
char const * type; char const * type;
if(git->filename == NULL) if(git->filename == NULL)
@ -561,37 +559,11 @@ static void _git_on_add(gpointer data)
basename = g_path_get_basename(git->filename); basename = g_path_get_basename(git->filename);
argv[3] = basename; argv[3] = basename;
type = git->helper->get_type(git->helper->browser, git->filename, 0); type = git->helper->get_type(git->helper->browser, git->filename, 0);
if(_add_is_binary(type))
{
/* FIXME this should certainly be removed */
argv[4] = argv[3];
argv[3] = argv[2];
argv[2] = "-kb";
}
_git_add_task(git, "git add", dirname, argv); _git_add_task(git, "git add", dirname, argv);
g_free(basename); g_free(basename);
g_free(dirname); g_free(dirname);
} }
static gboolean _add_is_binary(char const * type)
{
char const text[] = "text/";
char const * types[] = { "application/x-perl",
"application/x-shellscript",
"application/xml",
"application/xslt+xml" };
size_t i;
if(type == NULL)
return TRUE;
if(strncmp(text, type, sizeof(text) - 1) == 0)
return FALSE;
for(i = 0; i < sizeof(types) / sizeof(*types); i++)
if(strcmp(types[i], type) == 0)
return FALSE;
return TRUE;
}
/* git_on_blame */ /* git_on_blame */
static void _git_on_blame(gpointer data) static void _git_on_blame(gpointer data)